fix: update code that switch types on invalid params

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
distribution · Dec 14, 2023 · d467325 · d467325
1 parent 3f5546b
commit d467325
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go
@@ -641,7 +641,7 @@ func TestURLPrefix(t *testing.T) {
 	config := configuration.Configuration{
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},
@@ -724,7 +724,7 @@ func TestRelativeURL(t *testing.T) {
 	config := configuration.Configuration{
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},
@@ -1458,7 +1458,7 @@ func TestGetManifestWithStorageError(t *testing.T) {
 	config := configuration.Configuration{
 		Storage: configuration.Storage{
 			"storagemanifesterror": configuration.Parameters{},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},
@@ -2169,7 +2169,7 @@ func newTestEnvMirror(t *testing.T, deleteEnabled bool) *testEnv {
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
 			"delete":   configuration.Parameters{"enabled": deleteEnabled},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},
@@ -2189,7 +2189,7 @@ func newTestEnv(t *testing.T, deleteEnabled bool) *testEnv {
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
 			"delete":   configuration.Parameters{"enabled": deleteEnabled},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},
@@ -2745,7 +2745,7 @@ func TestProxyManifestGetByTag(t *testing.T) {
 	truthConfig := configuration.Configuration{
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},

diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go
@@ -143,7 +143,7 @@ func TestNewApp(t *testing.T) {
 	config := configuration.Configuration{
 		Storage: configuration.Storage{
 			"inmemory": nil,
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},

diff --git a/registry/handlers/health_test.go b/registry/handlers/health_test.go
@@ -26,7 +26,7 @@ func TestFileHealthCheck(t *testing.T) {
 	config := &configuration.Configuration{
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},
@@ -89,7 +89,7 @@ func TestTCPHealthCheck(t *testing.T) {
 	config := &configuration.Configuration{
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},
@@ -151,7 +151,7 @@ func TestHTTPHealthCheck(t *testing.T) {
 	config := &configuration.Configuration{
 		Storage: configuration.Storage{
 			"inmemory": configuration.Parameters{},
-			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+			"maintenance": configuration.Parameters{"uploadpurging": configuration.Parameters{
 				"enabled": false,
 			}},
 		},

diff --git a/registry/storage/driver/gcs/gcs.go b/registry/storage/driver/gcs/gcs.go
@@ -170,18 +170,14 @@ func FromParameters(ctx context.Context, parameters map[string]interface{}) (sto
 			return nil, err
 		}
 	} else if credentials, ok := parameters["credentials"]; ok {
-		credentialMap, ok := credentials.(map[interface{}]interface{})
+		credentialMap, ok := credentials.(map[string]interface{})
 		if !ok {
 			return nil, fmt.Errorf("The credentials were not specified in the correct format")
 		}
 
 		stringMap := map[string]interface{}{}
 		for k, v := range credentialMap {
-			key, ok := k.(string)
-			if !ok {
-				return nil, fmt.Errorf("One of the credential keys was not a string: %s", fmt.Sprint(k))
-			}
-			stringMap[key] = v
+			stringMap[k] = v
 		}
 
 		data, err := json.Marshal(stringMap)