From 30a8ce59861a4d9fc935d8e1dd53664208876621 Mon Sep 17 00:00:00 2001 From: Josh Dolitsky Date: Wed, 14 Jul 2021 16:25:29 -0400 Subject: [PATCH] Reverse DependingChart test logic, add debug logs Signed-off-by: Josh Dolitsky --- pkg/repo/repotest/server.go | 47 +++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go index 40d8783c5..a7c6b1a67 100644 --- a/pkg/repo/repotest/server.go +++ b/pkg/repo/repotest/server.go @@ -181,31 +181,44 @@ func (srv *OCIServer) Run(t *testing.T, opts ...OCIServerOpt) { t.Fatal("could not load chart into memory") } - _, err = registryClient.Push(contentBytes, ref) + result, err := registryClient.Push(contentBytes, ref) if err != nil { t.Fatalf("error pushing dependent chart: %s", err) } + t.Logf("Manifest.Digest: %s, Manifest.Size: %d, "+ + "Config.Digest: %s, Config.Size: %d, "+ + "Chart.Digest: %s, Chart.Size: %d", + result.Manifest.Digest, result.Manifest.Size, + result.Config.Digest, result.Config.Size, + result.Chart.Digest, result.Chart.Size) - if cfg.DependingChart != nil { - c := cfg.DependingChart - dependingRef := fmt.Sprintf("%s/u/ocitestuser/%s:%s", - srv.RegistryURL, c.Metadata.Name, c.Metadata.Version) + srv.Client = registryClient + c := cfg.DependingChart + if c == nil { + return + } - // load it into memory... - absPath := filepath.Join(srv.Dir, - fmt.Sprintf("%s-%s.tgz", c.Metadata.Name, c.Metadata.Version)) - contentBytes, err := ioutil.ReadFile(absPath) - if err != nil { - t.Fatal("could not load chart into memory") - } + dependingRef := fmt.Sprintf("%s/u/ocitestuser/%s:%s", + srv.RegistryURL, c.Metadata.Name, c.Metadata.Version) - _, err = registryClient.Push(contentBytes, dependingRef) - if err != nil { - t.Fatalf("error pushing depending chart: %s", err) - } + // load it into memory... + absPath = filepath.Join(srv.Dir, + fmt.Sprintf("%s-%s.tgz", c.Metadata.Name, c.Metadata.Version)) + contentBytes, err = ioutil.ReadFile(absPath) + if err != nil { + t.Fatal("could not load chart into memory") } - srv.Client = registryClient + result, err = registryClient.Push(contentBytes, dependingRef) + if err != nil { + t.Fatalf("error pushing depending chart: %s", err) + } + t.Logf("Manifest.Digest: %s, Manifest.Size: %d, "+ + "Config.Digest: %s, Config.Size: %d, "+ + "Chart.Digest: %s, Chart.Size: %d", + result.Manifest.Digest, result.Manifest.Size, + result.Config.Digest, result.Config.Size, + result.Chart.Digest, result.Chart.Size) } // NewTempServer creates a server inside of a temp dir.