fix: parse allowed_account_types in provider config (#91)

* fix: introduce allowed_account_types in ProviderConfig proto message * fix: nil safe check for accessing appeal config
raystack · Dec 13, 2021 · 9d196b5 · 9d196b5
1 parent dcb8ee5
commit 9d196b5
Show file tree

Hide file tree

Showing 4 changed files with 500 additions and 475 deletions.
diff --git a/api/handler/v1beta1/adapter.go b/api/handler/v1beta1/adapter.go
@@ -64,13 +64,19 @@ func (a *adapter) FromProviderConfigProto(pc *guardianv1beta1.ProviderConfig) (*
 		})
 	}
 
+	var allowedAccountTypes []string
+	if pc.GetAllowedAccountTypes() != nil {
+		allowedAccountTypes = pc.GetAllowedAccountTypes()
+	}
+
 	return &domain.ProviderConfig{
-		Type:        pc.GetType(),
-		URN:         pc.GetUrn(),
-		Labels:      pc.GetLabels(),
-		Credentials: pc.GetCredentials().AsInterface(),
-		Appeal:      appealConfig,
-		Resources:   resources,
+		Type:                pc.GetType(),
+		URN:                 pc.GetUrn(),
+		Labels:              pc.GetLabels(),
+		Credentials:         pc.GetCredentials().AsInterface(),
+		Appeal:              appealConfig,
+		Resources:           resources,
+		AllowedAccountTypes: allowedAccountTypes,
 	}, nil
 }
 
@@ -122,13 +128,19 @@ func (a *adapter) ToProviderConfigProto(pc *domain.ProviderConfig) (*guardianv1b
 		})
 	}
 
+	var allowedAccountTypes []string
+	if pc.AllowedAccountTypes != nil {
+		allowedAccountTypes = pc.AllowedAccountTypes
+	}
+
 	return &guardianv1beta1.ProviderConfig{
-		Type:        pc.Type,
-		Urn:         pc.URN,
-		Labels:      pc.Labels,
-		Credentials: credentials,
-		Appeal:      appeal,
-		Resources:   resources,
+		Type:                pc.Type,
+		Urn:                 pc.URN,
+		Labels:              pc.Labels,
+		Credentials:         credentials,
+		Appeal:              appeal,
+		Resources:           resources,
+		AllowedAccountTypes: allowedAccountTypes,
 	}, nil
 }