From 6b2fc4d966af2027f2a8762bfe65e804ed17d433 Mon Sep 17 00:00:00 2001 From: Vaibhav Sharma <17532va@gmail.com> Date: Sun, 12 Feb 2023 12:58:27 +0530 Subject: [PATCH] Created new function Signed-off-by: Vaibhav Sharma <17532va@gmail.com> --- pkg/repo/repotest/server.go | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go index 1eaa31f26..febce702a 100644 --- a/pkg/repo/repotest/server.go +++ b/pkg/repo/repotest/server.go @@ -50,14 +50,14 @@ import ( // The caller is responsible for stopping the server. // The temp dir will be removed by testing package automatically when test finished. func NewTempServerWithCleanup(t *testing.T, glob string) (*Server, error) { - srv, _, err := NewTempServer(glob) + srv, err := NewTempServer(glob) t.Cleanup(func() { os.RemoveAll(srv.docroot) }) return srv, err } // Set up a server with multiple fake repo func NewTempServerWithCleanupAndMultipleRepos(t *testing.T, glob string) (*Server, error) { - srv, tdir, err := NewTempServer(glob) + srv, tdir, err := NewTempServerWithMultipleRepos(glob) urls := []string{srv.URL(), "http://foobarbazz:9001"} if err := setTestingRepositories(urls, filepath.Join(tdir, "repositories.yaml")); err != nil { panic(err) @@ -263,7 +263,24 @@ func (srv *OCIServer) Run(t *testing.T, opts ...OCIServerOpt) { // the server. // // Deprecated: use NewTempServerWithCleanup -func NewTempServer(glob string) (*Server, string, error) { +func NewTempServer(glob string) (*Server, error) { + tdir, err := ioutil.TempDir("", "helm-repotest-") + if err != nil { + return nil, err + } + srv := NewServer(tdir) + + if glob != "" { + if _, err := srv.CopyCharts(glob); err != nil { + srv.Stop() + return srv, err + } + } + + return srv, nil +} + +func NewTempServerWithMultipleRepos(glob string) (*Server, string, error) { tdir, err := ioutil.TempDir("", "helm-repotest-") if err != nil { return nil, tdir, err