@@ -66,6 +66,12 @@ const (
6666 retentionRecords = 2
6767)
6868
69+ const (
70+ testRegistryHtpasswdFileBasename = "authtest.htpasswd"
71+ testRegistryUsername = "myuser"
72+ testRegistryPassword = "mypass"
73+ )
74+
6975var (
7076 testEnv * testenv.Environment
7177 testStorage * Storage
@@ -94,69 +100,62 @@ var (
94100)
95101
96102var (
97- testRegistryClient * helmreg.Client
98- testRegistryserver * RegistryClientTestServer
99- )
100-
101- var (
102- testWorkspaceDir = "registry-test"
103- testHtpasswdFileBasename = "authtest.htpasswd"
104- testUsername = "myuser"
105- testPassword = "mypass"
103+ testRegistryServer * registryClientTestServer
106104)
107105
108106func init () {
109107 rand .Seed (time .Now ().UnixNano ())
110108}
111109
112- type RegistryClientTestServer struct {
113- Out io.Writer
114- DockerRegistryHost string
115- WorkspaceDir string
116- RegistryClient * helmreg.Client
110+ type registryClientTestServer struct {
111+ out io.Writer
112+ dockerRegistryHost string
113+ workspaceDir string
114+ registryClient * helmreg.Client
117115}
118116
119- func SetupServer (server * RegistryClientTestServer ) string {
117+ func setupRegistryServer (ctx context.Context ) (* registryClientTestServer , error ) {
118+ server := & registryClientTestServer {}
119+
120120 // Create a temporary workspace directory for the registry
121- server .WorkspaceDir = testWorkspaceDir
122- os .RemoveAll (server .WorkspaceDir )
123- err := os .Mkdir (server .WorkspaceDir , 0700 )
121+ workspaceDir , err := os .MkdirTemp ("" , "registry-test-" )
124122 if err != nil {
125- panic ( fmt .Sprintf ("failed to create workspace directory: %s " , err ) )
123+ return nil , fmt .Errorf ("failed to create workspace directory: %w " , err )
126124 }
125+ server .workspaceDir = workspaceDir
127126
128127 var out bytes.Buffer
129- server .Out = & out
128+ server .out = & out
130129
131130 // init test client
132- server .RegistryClient , err = helmreg .NewClient (
131+ server .registryClient , err = helmreg .NewClient (
133132 helmreg .ClientOptDebug (true ),
134- helmreg .ClientOptWriter (server .Out ),
133+ helmreg .ClientOptWriter (server .out ),
135134 )
136135 if err != nil {
137- panic ( fmt .Sprintf ("failed to create registry client: %s" , err ) )
136+ return nil , fmt .Errorf ("failed to create registry client: %s" , err )
138137 }
139138
140139 // create htpasswd file (w BCrypt, which is required)
141- pwBytes , err := bcrypt .GenerateFromPassword ([]byte (testPassword ), bcrypt .DefaultCost )
140+ pwBytes , err := bcrypt .GenerateFromPassword ([]byte (testRegistryPassword ), bcrypt .DefaultCost )
142141 if err != nil {
143- panic ( fmt .Sprintf ("failed to generate password: %s" , err ) )
142+ return nil , fmt .Errorf ("failed to generate password: %s" , err )
144143 }
145144
146- htpasswdPath := filepath .Join (testWorkspaceDir , testHtpasswdFileBasename )
147- err = ioutil .WriteFile (htpasswdPath , []byte (fmt .Sprintf ("%s:%s\n " , testUsername , string (pwBytes ))), 0644 )
145+ htpasswdPath := filepath .Join (workspaceDir , testRegistryHtpasswdFileBasename )
146+ err = ioutil .WriteFile (htpasswdPath , []byte (fmt .Sprintf ("%s:%s\n " , testRegistryUsername , string (pwBytes ))), 0644 )
148147 if err != nil {
149- panic ( fmt .Sprintf ("failed to create htpasswd file: %s" , err ) )
148+ return nil , fmt .Errorf ("failed to create htpasswd file: %s" , err )
150149 }
151150
152151 // Registry config
153152 config := & configuration.Configuration {}
154153 port , err := freeport .GetFreePort ()
155154 if err != nil {
156- panic ( fmt .Sprintf ("failed to get free port: %s" , err ) )
155+ return nil , fmt .Errorf ("failed to get free port: %s" , err )
157156 }
158157
159- server .DockerRegistryHost = fmt .Sprintf ("localhost:%d" , port )
158+ server .dockerRegistryHost = fmt .Sprintf ("localhost:%d" , port )
160159 config .HTTP .Addr = fmt .Sprintf ("127.0.0.1:%d" , port )
161160 config .HTTP .DrainTimeout = time .Duration (10 ) * time .Second
162161 config .Storage = map [string ]configuration.Parameters {"inmemory" : map [string ]interface {}{}}
@@ -166,15 +165,15 @@ func SetupServer(server *RegistryClientTestServer) string {
166165 "path" : htpasswdPath ,
167166 },
168167 }
169- dockerRegistry , err := dockerRegistry .NewRegistry (context . Background () , config )
168+ dockerRegistry , err := dockerRegistry .NewRegistry (ctx , config )
170169 if err != nil {
171- panic ( fmt .Sprintf ("failed to create docker registry: %s " , err ) )
170+ return nil , fmt .Errorf ("failed to create docker registry: %w " , err )
172171 }
173172
174173 // Start Docker registry
175174 go dockerRegistry .ListenAndServe ()
176175
177- return server . WorkspaceDir
176+ return server , nil
178177}
179178
180179func TestMain (m * testing.M ) {
@@ -199,12 +198,9 @@ func TestMain(m *testing.M) {
199198
200199 testMetricsH = controller .MustMakeMetrics (testEnv )
201200
202- testRegistryserver = & RegistryClientTestServer {}
203- registryWorkspaceDir := SetupServer (testRegistryserver )
204-
205- testRegistryClient , err = helmreg .NewClient (helmreg .ClientOptWriter (os .Stdout ))
201+ testRegistryServer , err = setupRegistryServer (ctx )
206202 if err != nil {
207- panic (fmt .Sprintf ("Failed to create OCI registry client" ))
203+ panic (fmt .Sprintf ("Failed to create a test registry server: %v" , err ))
208204 }
209205
210206 if err := (& GitRepositoryReconciler {
@@ -282,7 +278,7 @@ func TestMain(m *testing.M) {
282278 panic (fmt .Sprintf ("Failed to remove storage server dir: %v" , err ))
283279 }
284280
285- if err := os .RemoveAll (registryWorkspaceDir ); err != nil {
281+ if err := os .RemoveAll (testRegistryServer . workspaceDir ); err != nil {
286282 panic (fmt .Sprintf ("Failed to remove registry workspace dir: %v" , err ))
287283 }
288284
0 commit comments