Skip to content

Commit

Permalink
fixup! Update ctrl-runtime (v0.15), Kubernetes (v1.27), kyaml (v5)
Browse files Browse the repository at this point in the history
  • Loading branch information
hiddeco committed May 25, 2023
1 parent 86f411b commit c8dc943
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions internal/controller/controllers_fuzzer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"os/exec"
"path/filepath"
"sync"
"testing"
"time"

fuzz "github.com/AdaLogics/go-fuzz-headers"
Expand Down Expand Up @@ -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
}
Expand All @@ -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 {
Expand All @@ -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
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit c8dc943

Please sign in to comment.