Merge branch 'master' into 46998-expose-azure-application-and-sp-on-onboarding

miguelpais · web-flow · commit 0f7d27f53fe9 · 2024-10-03T16:10:09.000+02:00
diff --git a/sysdig/resource_sysdig_monitor_cloud_account.go b/sysdig/resource_sysdig_monitor_cloud_account.go
@@ -3,6 +3,7 @@ package sysdig
 import (
 	"context"
 	"strconv"
+	"strings"
 	"time"
 
 	v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"
@@ -185,7 +186,7 @@ func monitorCloudAccountToResourceData(data *schema.ResourceData, cloudAccount *
 		return err
 	}
 
-	err = data.Set("role_name", cloudAccount.Credentials.RoleName)
+	err = data.Set("role_name", strings.Split(cloudAccount.Credentials.RoleName, ":role/")[1])
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package sysdig`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"strconv"`
	`6`	`+ "strings"`
`6`	`7`	`"time"`
`7`	`8`
`8`	`9`	`v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"`
`@@ -185,7 +186,7 @@ func monitorCloudAccountToResourceData(data schema.ResourceData, cloudAccount `
`185`	`186`	`return err`
`186`	`187`	`}`
`187`	`188`
`188`		`- err = data.Set("role_name", cloudAccount.Credentials.RoleName)`
	`189`	`+ err = data.Set("role_name", strings.Split(cloudAccount.Credentials.RoleName, ":role/")[1])`
`189`	`190`	`if err != nil {`
`190`	`191`	`return err`
`191`	`192`	`}`