Fix tests

cloudsmith-io · Nov 29, 2024 · 740191b · 740191b
1 parent b674e6e
commit 740191b
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/cloudsmith/resource_oidc_test.go b/cloudsmith/resource_oidc_test.go
@@ -31,32 +31,34 @@ func TestAccOidc_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "enabled", "true"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "name", "test-oidc-terraform-provider"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "provider_url", "https://test.com"),
-					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "service_accounts.0", "test-oidc-service-account"),
+					resource.TestMatchResourceAttr("cloudsmith_oidc.test", "service_accounts.0", regexp.MustCompile("^test-oidc-service-account.*$")),
 				),
 			},
 			{
 				Config: testAccOidcConfigBasicUpdateName,
 				Check: resource.ComposeTestCheckFunc(
+					testAccServiceCheckExists("cloudsmith_service.test"),
 					testAccOidcCheckExists("cloudsmith_oidc.test"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "namespace", os.Getenv("CLOUDSMITH_NAMESPACE")),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "claims.key", "value2"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "enabled", "false"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "name", "test-oidc-terraform-provider-updated"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "provider_url", "https://test.com"),
-					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "service_accounts.0", "test-oidc-service-account"),
+					resource.TestMatchResourceAttr("cloudsmith_oidc.test", "service_accounts.0", regexp.MustCompile("^test-oidc-service-account.*$")),
 				),
 			},
 			{
 				Config: testAccOidcConfigBasicUpdateProps,
 				Check: resource.ComposeTestCheckFunc(
+					testAccServiceCheckExists("cloudsmith_service.test"),
 					testAccOidcCheckExists("cloudsmith_oidc.test"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "namespace", os.Getenv("CLOUDSMITH_NAMESPACE")),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "claims.key", "value"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "claims.key2", "value2"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "enabled", "true"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "name", "test-oidc-terraform-provider-updated"),
 					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "provider_url", "https://test-updated-url.com"),
-					resource.TestCheckResourceAttr("cloudsmith_oidc.test", "service_accounts.0", "test-oidc-service-account"),
+					resource.TestMatchResourceAttr("cloudsmith_oidc.test", "service_accounts.0", regexp.MustCompile("^test-oidc-service-account.*$")),
 				),
 			},
 			{
@@ -127,7 +129,7 @@ resource "cloudsmith_oidc" "test" {
       enabled = true
       name = "test-oidc-terraform-provider"
       provider_url = "https://test.com"
-      service_accounts = [cloudsmith_service.test.name]
+      service_accounts = [cloudsmith_service.test.slug]
 }
 `, os.Getenv("CLOUDSMITH_NAMESPACE"), os.Getenv("CLOUDSMITH_NAMESPACE"))
 
@@ -146,7 +148,7 @@ resource "cloudsmith_oidc" "test" {
       enabled = false
       name = "test-oidc-terraform-provider-updated"
       provider_url = "https://test.com"
-      service_accounts = [cloudsmith_service.test.name]
+      service_accounts = [cloudsmith_service.test.slug]
 }
 `, os.Getenv("CLOUDSMITH_NAMESPACE"), os.Getenv("CLOUDSMITH_NAMESPACE"))
 
@@ -166,7 +168,7 @@ resource "cloudsmith_oidc" "test" {
       enabled = true
       name = "test-oidc-terraform-provider-updated"
       provider_url = "https://test-updated-url.com"
-      service_accounts = [cloudsmith_service.test.name]
+      service_accounts = [cloudsmith_service.test.slug]
 }
 `, os.Getenv("CLOUDSMITH_NAMESPACE"), os.Getenv("CLOUDSMITH_NAMESPACE"))
 
@@ -187,7 +189,7 @@ resource "cloudsmith_oidc" "test" {
       enabled = true
       name = "test-oidc-terraform-provider-updated"
       provider_url = "invalid-url"
-      service_accounts = [cloudsmith_service.test.name]
+      service_accounts = [cloudsmith_service.test.slug]
 }
 `, os.Getenv("CLOUDSMITH_NAMESPACE"), os.Getenv("CLOUDSMITH_NAMESPACE"))