fixup! Update ctrl-runtime (v0.15), Kubernetes (v1.27), kyaml (v5)

fluxcd · May 25, 2023 · c8dc943 · c8dc943
1 parent 86f411b
commit c8dc943
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/internal/controller/controllers_fuzzer_test.go b/internal/controller/controllers_fuzzer_test.go
@@ -29,6 +29,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"sync"
+	"testing"
 	"time"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
@@ -332,7 +333,7 @@ func FuzzUpdateWithSetters(f *testing.F) {
 // Initialise a git server with a repo including the files in dir.
 func initGitRepo(gitServer *gittestserver.GitServer, fixture, branch, repositoryPath string) error {
 	fs := memfs.New()
-	repo, err := git.Init(memory.NewStorage(), fs)
+	repo, err := gogit.Init(memory.NewStorage(), fs)
 	if err != nil {
 		return err
 	}
@@ -346,7 +347,7 @@ func initGitRepo(gitServer *gittestserver.GitServer, fixture, branch, repository
 	if err != nil {
 		return err
 	}
-	if err = working.Checkout(&git.CheckoutOptions{
+	if err = working.Checkout(&gogit.CheckoutOptions{
 		Branch: plumbing.NewBranchReferenceName(branch),
 		Create: true,
 	}); err != nil {
@@ -361,14 +362,14 @@ func initGitRepo(gitServer *gittestserver.GitServer, fixture, branch, repository
 		return err
 	}
 
-	return remote.Push(&git.PushOptions{
+	return remote.Push(&gogit.PushOptions{
 		RefSpecs: []config.RefSpec{
 			config.RefSpec(fmt.Sprintf("refs/heads/%s:refs/heads/%s", branch, branch)),
 		},
 	})
 }
 
-func populateRepoFromFixture(repo *gogit.Repository, fixture string) error {
+func populateRepoFromFixture(repo *gogogit.Repository, fixture string) error {
 	working, err := repo.Worktree()
 	if err != nil {
 		return err
@@ -413,7 +414,7 @@ func populateRepoFromFixture(repo *gogit.Repository, fixture string) error {
 		return err
 	}
 
-	if _, err = working.Commit("Initial revision from "+fixture, &gogit.CommitOptions{
+	if _, err = working.Commit("Initial revision from "+fixture, &gogogit.CommitOptions{
 		Author: &object.Signature{
 			Name:  "Testbot",
 			Email: "test@example.com",