From bfd876bde921f4298c7aac46bdfcdc0466046bd9 Mon Sep 17 00:00:00 2001 From: Javier Romero Date: Thu, 27 Jun 2019 16:37:28 -0500 Subject: [PATCH] wip Signed-off-by: Andrew Meyer --- cmd/exporter/main.go | 78 ++++++++++++++++++++++++++++++--------- cmd/exporter/main_test.go | 10 +++-- 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/cmd/exporter/main.go b/cmd/exporter/main.go index f28846bd7..6fb5a7247 100644 --- a/cmd/exporter/main.go +++ b/cmd/exporter/main.go @@ -101,13 +101,13 @@ func export() error { ArtifactsDir: artifactsDir, } - var analyzedMD metadata.AnalyzedMetadata - _, err = toml.DecodeFile(analyzedPath, &analyzedMD) + analyzedMD, err := parseOptionalAnalyzedMD(outLog, analyzedPath) if err != nil { - return cmd.FailErrCode(errors.Wrapf(err, "no analyzed.toml found at path '%s'", analyzedPath), cmd.CodeInvalidArgs, "parse arguments") + return cmd.FailErrCode(err, cmd.CodeInvalidArgs, "parse analyzed TOML") } - if err := validateSingleRegistry(append(repoNames, analyzedMD.Repository)...); err != nil { + var registry string + if registry, err = ensureSingleRegistry(appendNonEmpty(repoNames, analyzedMD.Repository)...); err != nil { return cmd.FailErrCode(err, cmd.CodeInvalidArgs, "parse arguments") } @@ -122,14 +122,14 @@ func export() error { return cmd.FailErrCode(errors.New("-image is required when there is no stack metadata available"), cmd.CodeInvalidArgs, "parse arguments") } - runImageRef, err = runImageFromStackToml(stackMD, analyzedMD.Repository) + runImageRef, err = runImageFromStackToml(stackMD, registry) if err != nil { return err } } if useHelpers { - if err := lifecycle.SetupCredHelpers(filepath.Join(os.Getenv("HOME"), ".docker"), analyzedMD.Repository, runImageRef); err != nil { + if err := lifecycle.SetupCredHelpers(filepath.Join(os.Getenv("HOME"), ".docker"), repoNames[0], runImageRef); err != nil { return cmd.FailErr(err, "setup credential helpers") } } @@ -141,12 +141,20 @@ func export() error { return err } + var opts = []local.ImageOption{ + local.FromBaseImage(runImageRef), + } + + if analyzedMD.Repository != "" { + opts = append(opts, local.WithPreviousImage(analyzedMD.FullName())) + } + appImage, err = local.NewImage( repoNames[0], dockerClient, - local.FromBaseImage(runImageRef), - local.WithPreviousImage(analyzedMD.FullName()), + opts..., ) + if err != nil { return cmd.FailErr(err, "access run image") } @@ -159,11 +167,18 @@ func export() error { appImage = lifecycle.NewCachingImage(appImage, volumeCache) } } else { + var opts = []remote.ImageOption{ + remote.FromBaseImage(runImageRef), + } + + if analyzedMD.Repository != "" { + opts = append(opts, remote.WithPreviousImage(analyzedMD.FullName())) + } + appImage, err = remote.NewImage( repoNames[0], auth.DefaultEnvKeychain(), - remote.FromBaseImage(runImageRef), - remote.WithPreviousImage(analyzedMD.FullName()), + opts..., ) if err != nil { return cmd.FailErr(err, "access run image") @@ -181,12 +196,31 @@ func export() error { return nil } -func runImageFromStackToml(stack metadata.StackMetadata, repoName string) (string, error) { - registry, err := image.ParseRegistry(repoName) +func appendNonEmpty(slice []string, el string) []string { + if el != "" { + return append(slice, el) + } + + return slice +} + +func parseOptionalAnalyzedMD(logger *log.Logger, path string) (metadata.AnalyzedMetadata, error) { + var analyzedMD metadata.AnalyzedMetadata + + _, err := toml.DecodeFile(path, &analyzedMD) if err != nil { - return "", cmd.FailErrCode(err, cmd.CodeInvalidArgs, "parse image name") + if !os.IsNotExist(err) { + logger.Printf("Warning: analyzed TOML file not found at '%s'", path) + return metadata.AnalyzedMetadata{}, nil + } + + return metadata.AnalyzedMetadata{}, err } + return analyzedMD, nil +} + +func runImageFromStackToml(stack metadata.StackMetadata, registry string) (string, error) { runImageMirrors := []string{stack.RunImage.Image} runImageMirrors = append(runImageMirrors, stack.RunImage.Mirrors...) runImageRef, err := image.ByRegistry(registry, runImageMirrors) @@ -196,17 +230,25 @@ func runImageFromStackToml(stack metadata.StackMetadata, repoName string) (strin return runImageRef, nil } -func validateSingleRegistry(repoNames ...string) error { +func ensureSingleRegistry(repoNames ...string) (string, error) { set := make(map[string]interface{}) + + var ( + err error + registry string + ) + for _, repoName := range repoNames { - registry, err := image.ParseRegistry(repoName) + registry, err = image.ParseRegistry(repoName) if err != nil { - return errors.Wrapf(err, "parsing registry from repo '%s'", repoName) + return "", errors.Wrapf(err, "parsing registry from repo '%s'", repoName) } set[registry] = nil } + if len(set) != 1 { - return errors.New("exporting to multiple registries is unsupported") + return "", errors.New("exporting to multiple registries is unsupported") } - return nil + + return registry, nil } diff --git a/cmd/exporter/main_test.go b/cmd/exporter/main_test.go index fd7cbffb0..9390805df 100644 --- a/cmd/exporter/main_test.go +++ b/cmd/exporter/main_test.go @@ -14,18 +14,20 @@ func TestAnalyzer(t *testing.T) { } func testExporter(t *testing.T, when spec.G, it spec.S) { - when("#validateSingleRegistry", func() { + when("#ensureSingleRegistry", func() { when("multiple registries are provided", func() { it("errors as unsupported", func() { - err := validateSingleRegistry("some/repo", "gcr.io/other-repo:latest", "example.com/final-repo") + _, err := ensureSingleRegistry("some/repo", "gcr.io/other-repo:latest", "example.com/final-repo") h.AssertError(t, err, "exporting to multiple registries is unsupported") }) }) when("a single registry is provided", func() { - it("does not return an error", func() { - err := validateSingleRegistry("gcr.io/some/repo", "gcr.io/other-repo:latest", "gcr.io/final-repo") + it("does not return an error and", func() { + registry, err := ensureSingleRegistry("gcr.io/some/repo", "gcr.io/other-repo:latest", "gcr.io/final-repo") h.AssertNil(t, err) + + h.AssertEq(t, registry, "gcr.io") }) }) })