Set service account role to "None" if no role is provided

Boostport · Apr 3, 2024 · 5a1ce44 · 5a1ce44
1 parent 8322f22
commit 5a1ce44
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/path_credentials.go b/path_credentials.go
@@ -164,9 +164,14 @@ func createCloudAccessPolicyToken(c *client.Grafana, credentialName string, role
 }
 
 func createCloudServiceAccountToken(c *client.Grafana, credentialName string, roleEntry *grafanaRoleEntry) (*grafanaToken, error) {
+	role := "None"
+	if roleEntry.Role != "" {
+		role = roleEntry.Role
+	}
+
 	serviceAccount, err := c.CreateGrafanaServiceAccountFromCloud(roleEntry.Stack, client.CreateServiceAccountInput{
 		Name: credentialName,
-		Role: roleEntry.Role,
+		Role: role,
 	})
 
 	if err != nil {
@@ -197,9 +202,14 @@ func createCloudServiceAccountToken(c *client.Grafana, credentialName string, ro
 }
 
 func createServiceAccountToken(c *client.Grafana, credentialName string, roleEntry *grafanaRoleEntry) (*grafanaToken, error) {
+	role := "None"
+	if roleEntry.Role != "" {
+		role = roleEntry.Role
+	}
+
 	serviceAccount, err := c.CreateServiceAccount(client.CreateServiceAccountInput{
 		Name: credentialName,
-		Role: roleEntry.Role,
+		Role: role,
 	})
 
 	if err != nil {