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

Split publishing and loading #731

Merged
merged 1 commit into from
Jul 19, 2023
Merged

Split publishing and loading #731

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
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module chainguard.dev/apko
go 1.20

require (
github.com/avast/retry-go v3.0.0+incompatible
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220920003936-cd2dbcbbab49
github.com/chainguard-dev/go-apk v0.0.0-20230710230135-7fc46e8b3c4d
github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
github.com/aws/aws-sdk-go-v2 v1.16.15/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUYOqTerZPaF9k=
github.com/aws/aws-sdk-go-v2 v1.16.16/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUYOqTerZPaF9k=
github.com/aws/aws-sdk-go-v2 v1.18.1 h1:+tefE750oAb7ZQGzla6bLkOwfcQCEtC5y2RqoqCeqKo=
Expand Down
35 changes: 25 additions & 10 deletions internal/cli/publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/chrismellard/docker-credential-acr-env/pkg/credhelper"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/authn/github"
"github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1/google"
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -224,8 +225,25 @@ func PublishCmd(ctx context.Context, outputRefs string, archs []types.Architectu
if logger == nil {
logger = log.NewLogger(os.Stderr)
}

if local {
// TODO: We shouldn't even need to build the index if we're loading a single image.
ref, err := oci.LoadIndex(ctx, idx, logger, tags)
if err != nil {
return fmt.Errorf("loading index: %w", err)
}
logger.Printf("using local option, exiting early")
fmt.Println(ref.String())
return nil
}

// publish each arch-specific image
refs, err := oci.PublishImagesFromIndex(ctx, idx, local, shouldPushTags, logger, tags, ropt...)
// TODO: This should just happen as part of PublishIndex.
ref, err := name.ParseReference(tags[0])
if err != nil {
return fmt.Errorf("parsing %q as tag: %w", tags[0], err)
}
refs, err := oci.PublishImagesFromIndex(ctx, idx, logger, ref.Context(), ropt...)
if err != nil {
return fmt.Errorf("publishing images from index: %w", err)
}
Expand All @@ -234,7 +252,7 @@ func PublishCmd(ctx context.Context, outputRefs string, archs []types.Architectu
}

// publish the index
finalDigest, _, err := oci.PublishIndex(ctx, idx, logger, local, shouldPushTags, tags, ropt...)
finalDigest, err := oci.PublishIndex(ctx, idx, logger, shouldPushTags, tags, ropt...)
if err != nil {
return fmt.Errorf("publishing image index: %w", err)
}
Expand All @@ -249,13 +267,6 @@ func PublishCmd(ctx context.Context, outputRefs string, archs []types.Architectu
}
}

// If saving local, exit early (no SBOMs etc.)
if local {
logger.Printf("using local option, exiting early")
fmt.Println(strings.Split(finalDigest.String(), "@")[0])
return nil
}

if !shouldPushTags {
allTags := tags
allTags = append(allTags, additionalTags...)
Expand All @@ -278,11 +289,13 @@ func PublishCmd(ctx context.Context, outputRefs string, archs []types.Architectu
return fmt.Errorf("failed to write tags: %w", err)
}
} else {
// TODO: Why does this happen separately from PublishIndex?
skipLocalCopy := strings.HasPrefix(finalDigest.Name(), fmt.Sprintf("%s/", oci.LocalDomain))
var g errgroup.Group
g, ctx := errgroup.WithContext(ctx)
for _, at := range additionalTags {
at := at
if skipLocalCopy {
// TODO: We probably don't need this now that we return early.
logger.Warnf("skipping local domain tag %s", at)
continue
}
Expand All @@ -298,6 +311,8 @@ func PublishCmd(ctx context.Context, outputRefs string, archs []types.Architectu
// publish each arch-specific sbom
// publish the index sbom
if wantSBOM {
// TODO: Why aren't these just attached to idx?

// all sboms will be in the same directory
if err := oci.PostAttachSBOMsFromIndex(
ctx, idx, sboms, logger, tags, ropt...,
Expand Down
Loading
Loading