Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup Code #2811

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Cleanup Code #2811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions porch/apiserver/pkg/registry/porch/packagerevision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"fmt"

api "github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
"github.com/GoogleContainerTools/kpt/porch/controllers/pkg/apis/porch/v1alpha1"
configapi "github.com/GoogleContainerTools/kpt/porch/controllers/pkg/apis/porch/v1alpha1"
"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -185,7 +184,7 @@ func (r *packageRevisions) Update(ctx context.Context, name string, objInfo rest
return nil, false, apierrors.NewBadRequest(fmt.Sprintf("invalid name %q", name))
}

var repositoryObj v1alpha1.Repository
var repositoryObj configapi.Repository
repositoryID := types.NamespacedName{Namespace: ns, Name: nameTokens.RepositoryName}
if err := r.coreClient.Get(ctx, repositoryID, &repositoryObj); err != nil {
if apierrors.IsNotFound(err) {
Expand Down
4 changes: 2 additions & 2 deletions porch/apiserver/pkg/registry/porch/packagerevisions_approval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ func (a *packageRevisionsApproval) Get(ctx context.Context, name string, options
// may allow updates creates the object - they should set the created boolean
// to true.
func (a *packageRevisionsApproval) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
forceAllowCreate = false // do not allow create on update
return a.revisions.Update(ctx, name, objInfo, createValidation, updateValidation, forceAllowCreate, options)
allowCreate := false // do not allow create on update
return a.revisions.Update(ctx, name, objInfo, createValidation, updateValidation, allowCreate, options)
}
4 changes: 2 additions & 2 deletions porch/engine/pkg/engine/clone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (m *clonePackageMutation) Apply(ctx context.Context, resources repository.P
}

func (m *clonePackageMutation) cloneFromRegisteredRepository(ctx context.Context) (repository.PackageResources, error) {
return repository.PackageResources{}, errors.New("Clone from Registered Repository is not implemented")
return repository.PackageResources{}, errors.New("clone from Registered Repository is not implemented")
}

func (m *clonePackageMutation) cloneFromGit(ctx context.Context, gitPackage *api.GitPackage) (repository.PackageResources, error) {
Expand Down Expand Up @@ -118,5 +118,5 @@ func (m *clonePackageMutation) cloneFromGit(ctx context.Context, gitPackage *api
}

func (m *clonePackageMutation) cloneFromOci(ctx context.Context, ociPackage *api.OciPackage) (repository.PackageResources, error) {
return repository.PackageResources{}, errors.New("Clone from OCI is not implemented")
return repository.PackageResources{}, errors.New("clone from OCI is not implemented")
}
3 changes: 3 additions & 0 deletions porch/engine/pkg/engine/clone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ func createRepoWithContents(t *testing.T, contentDir string) *gogit.Repository {
}

if err := filepath.Walk(contentDir, func(path string, info fs.FileInfo, err error) error {
if err != nil {
return err
}
if info.IsDir() {
return nil
} else if !info.Mode().IsRegular() {
Expand Down
3 changes: 1 addition & 2 deletions porch/repository/pkg/git/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
configapi "github.com/GoogleContainerTools/kpt/porch/controllers/pkg/apis/porch/v1alpha1"
"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
"github.com/go-git/go-git/v5"
gogit "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/config"
"github.com/go-git/go-git/v5/plumbing"
Expand Down Expand Up @@ -258,7 +257,7 @@ func (r *gitRepository) ApprovePackageRevision(ctx context.Context, path, revisi

newRef := plumbing.NewHashReference(approvedName, oldRef.Hash())

options := &git.PushOptions{
options := &gogit.PushOptions{
RemoteName: "origin",
RefSpecs: []config.RefSpec{},
Auth: auth,
Expand Down
7 changes: 3 additions & 4 deletions porch/repository/pkg/git/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"strings"
"time"

"github.com/go-git/go-git/v5"
gogit "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/filemode"
Expand Down Expand Up @@ -448,7 +447,7 @@ func (p *objectWalker) walkObjectTree(hash plumbing.Hash) error {
// Fetch the object.
obj, err := object.GetObject(p.Storer, hash)
if err != nil {
return fmt.Errorf("Getting object %s failed: %v", hash, err)
return fmt.Errorf("getting object %s failed: %v", hash, err)
}
// Walk all children depending on object type.
switch obj := obj.(type) {
Expand Down Expand Up @@ -488,13 +487,13 @@ func (p *objectWalker) walkObjectTree(hash plumbing.Hash) error {
return p.walkObjectTree(obj.Target)
default:
// Error out on unhandled object types.
return fmt.Errorf("Unknown object %s %s %T\n", obj.ID(), obj.Type(), obj)
return fmt.Errorf("unknown object %s %s %T", obj.ID(), obj.Type(), obj)
}
return nil
}

// initRepo is a helper that creates a first commit, ensuring the repo is not empty.
func initRepo(repo *git.Repository) error {
func initRepo(repo *gogit.Repository) error {
store := repo.Storer

var objectHash plumbing.Hash
Expand Down
3 changes: 1 addition & 2 deletions porch/repository/pkg/oci/mutate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"strconv"
"time"

"github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
api "github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
"github.com/google/go-containerregistry/pkg/gcrane"
Expand Down Expand Up @@ -107,7 +106,7 @@ type ociPackageDraft struct {

parent *ociRepository

tasks []v1alpha1.Task
tasks []api.Task

base v1.Image
tag name.Tag
Expand Down
6 changes: 3 additions & 3 deletions porch/test/git/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func main() {

func run(dirs []string) error {
if len(dirs) != 1 {
return fmt.Errorf("Expected one path to Git directory to serve. Got %d", len(dirs))
return fmt.Errorf("expected one path to Git directory to serve. Got %d", len(dirs))
}

dir := dirs[0]
Expand Down Expand Up @@ -80,8 +80,8 @@ func run(dirs []string) error {
address := <-addressChannel
fmt.Fprintf(os.Stderr, "Listening on %s\n", address)

wait := make(chan os.Signal)
signal.Notify(wait, os.Interrupt, os.Kill)
wait := make(chan os.Signal, 1)
signal.Notify(wait, os.Interrupt)

<-wait

Expand Down