@@ -94,69 +94,66 @@ var (
9494)
9595
9696var (
97- testRegistryClient * helmreg.Client
98- testRegistryserver * RegistryClientTestServer
97+ testRegistryserver * registryClientTestServer
9998)
10099
101100var (
102- testWorkspaceDir = "registry-test"
103- testHtpasswdFileBasename = "authtest.htpasswd"
104- testUsername = "myuser"
105- testPassword = "mypass"
101+ testRegistryWorkspaceDir = "/tmp/ registry-test"
102+ testRegistryHtpasswdFileBasename = "authtest.htpasswd"
103+ testRegistryUsername = "myuser"
104+ testRegistryPassword = "mypass"
106105)
107106
108107func init () {
109108 rand .Seed (time .Now ().UnixNano ())
110109}
111110
112- type RegistryClientTestServer struct {
113- Out io.Writer
114- DockerRegistryHost string
115- WorkspaceDir string
116- RegistryClient * helmreg.Client
111+ type registryClientTestServer struct {
112+ out io.Writer
113+ dockerRegistryHost string
114+ workspaceDir string
115+ registryClient * helmreg.Client
117116}
118117
119- func SetupServer (server * RegistryClientTestServer ) string {
118+ func setupRegistryServer (ctx context.Context ) (* registryClientTestServer , error ) {
119+ server := & registryClientTestServer {}
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+ server .workspaceDir = testRegistryWorkspaceDir
122+ os .RemoveAll (server .workspaceDir )
123+ err := os .Mkdir (server .workspaceDir , 0o700 )
124124 if err != nil {
125- panic ( fmt .Sprintf ("failed to create workspace directory: %s" , err ) )
125+ return nil , fmt .Errorf ("failed to create workspace directory: %s" , err )
126126 }
127127
128128 var out bytes.Buffer
129- server .Out = & out
129+ server .out = & out
130130
131131 // init test client
132- server .RegistryClient , err = helmreg .NewClient (
132+ server .registryClient , err = helmreg .NewClient (
133133 helmreg .ClientOptDebug (true ),
134- helmreg .ClientOptWriter (server .Out ),
134+ helmreg .ClientOptWriter (server .out ),
135135 )
136136 if err != nil {
137- panic ( fmt .Sprintf ("failed to create registry client: %s" , err ) )
137+ return nil , fmt .Errorf ("failed to create registry client: %s" , err )
138138 }
139139
140140 // create htpasswd file (w BCrypt, which is required)
141- pwBytes , err := bcrypt .GenerateFromPassword ([]byte (testPassword ), bcrypt .DefaultCost )
141+ pwBytes , err := bcrypt .GenerateFromPassword ([]byte (testRegistryPassword ), bcrypt .DefaultCost )
142142 if err != nil {
143- panic ( fmt .Sprintf ("failed to generate password: %s" , err ) )
143+ return nil , fmt .Errorf ("failed to generate password: %s" , err )
144144 }
145145
146- htpasswdPath := filepath .Join (testWorkspaceDir , testHtpasswdFileBasename )
147- err = ioutil .WriteFile (htpasswdPath , []byte (fmt .Sprintf ("%s:%s\n " , testUsername , string (pwBytes ))), 0644 )
146+ htpasswdPath := filepath .Join (testRegistryWorkspaceDir , testRegistryHtpasswdFileBasename )
147+ err = ioutil .WriteFile (htpasswdPath , []byte (fmt .Sprintf ("%s:%s\n " , testRegistryUsername , string (pwBytes ))), 0644 )
148148 if err != nil {
149- panic ( fmt .Sprintf ("failed to create htpasswd file: %s" , err ) )
149+ return nil , fmt .Errorf ("failed to create htpasswd file: %s" , err )
150150 }
151151
152152 // Registry config
153153 config := & configuration.Configuration {}
154154 port , err := freeport .GetFreePort ()
155- if err != nil {
156- panic (fmt .Sprintf ("failed to get free port: %s" , err ))
157- }
158155
159- server .DockerRegistryHost = fmt .Sprintf ("localhost:%d" , port )
156+ server .dockerRegistryHost = fmt .Sprintf ("localhost:%d" , port )
160157 config .HTTP .Addr = fmt .Sprintf ("127.0.0.1:%d" , port )
161158 config .HTTP .DrainTimeout = time .Duration (10 ) * time .Second
162159 config .Storage = map [string ]configuration.Parameters {"inmemory" : map [string ]interface {}{}}
@@ -166,15 +163,15 @@ func SetupServer(server *RegistryClientTestServer) string {
166163 "path" : htpasswdPath ,
167164 },
168165 }
169- dockerRegistry , err := dockerRegistry .NewRegistry (context . Background () , config )
166+ dockerRegistry , err := dockerRegistry .NewRegistry (ctx , config )
170167 if err != nil {
171- panic ( fmt .Sprintf ("failed to create docker registry: %s" , err ) )
168+ return nil , fmt .Errorf ("failed to create docker registry: %s" , err )
172169 }
173170
174171 // Start Docker registry
175172 go dockerRegistry .ListenAndServe ()
176173
177- return server . WorkspaceDir
174+ return server , nil
178175}
179176
180177func TestMain (m * testing.M ) {
@@ -199,12 +196,9 @@ func TestMain(m *testing.M) {
199196
200197 testMetricsH = controller .MustMakeMetrics (testEnv )
201198
202- testRegistryserver = & RegistryClientTestServer {}
203- registryWorkspaceDir := SetupServer (testRegistryserver )
204-
205- testRegistryClient , err = helmreg .NewClient (helmreg .ClientOptWriter (os .Stdout ))
199+ testRegistryserver , err = setupRegistryServer (ctx )
206200 if err != nil {
207- panic (fmt .Sprintf ("Failed to create OCI registry client" ))
201+ panic (fmt .Sprintf ("Failed to create a test registry server: %v" , err ))
208202 }
209203
210204 if err := (& GitRepositoryReconciler {
@@ -282,7 +276,7 @@ func TestMain(m *testing.M) {
282276 panic (fmt .Sprintf ("Failed to remove storage server dir: %v" , err ))
283277 }
284278
285- if err := os .RemoveAll (registryWorkspaceDir ); err != nil {
279+ if err := os .RemoveAll (testRegistryserver . workspaceDir ); err != nil {
286280 panic (fmt .Sprintf ("Failed to remove registry workspace dir: %v" , err ))
287281 }
288282
0 commit comments