SCALRCORE-27266 fixes.

Scalr · Jul 14, 2023 · 59104db · 59104db
1 parent f204cea
commit 59104db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scalr/resource_scalr_provider_configuration.go b/scalr/resource_scalr_provider_configuration.go
@@ -496,10 +496,10 @@ func resourceScalrProviderConfigurationRead(ctx context.Context, d *schema.Resou
 			if len(providerConfiguration.AwsTrustedEntityType) > 0 {
 				aws["trusted_entity_type"] = providerConfiguration.AwsTrustedEntityType
 			}
-			if len(providerConfiguration.AwsTrustedEntityType) > 0 {
+			if len(providerConfiguration.AwsRoleArn) > 0 {
 				aws["role_arn"] = providerConfiguration.AwsRoleArn
 			}
-			if len(providerConfiguration.AwsTrustedEntityType) > 0 {
+			if len(providerConfiguration.AwsExternalId) > 0 {
 				aws["external_id"] = providerConfiguration.AwsExternalId
 			}
 			if len(providerConfiguration.AwsWorkloadIdentityAudience) > 0 {

diff --git a/scalr/resource_scalr_provider_configuration_test.go b/scalr/resource_scalr_provider_configuration_test.go
@@ -385,7 +385,7 @@ func TestAccProviderConfiguration_aws_oidc(t *testing.T) {
 				Config: testAccScalrProviderConfigurationAWSOidcUpdatedConfig(rNewName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckProviderConfigurationExists("scalr_provider_configuration.aws", &providerConfiguration),
-					resource.TestCheckResourceAttr("scalr_provider_configuration.aws", "name", rName),
+					resource.TestCheckResourceAttr("scalr_provider_configuration.aws", "name", rNewName),
 					resource.TestCheckResourceAttr("scalr_provider_configuration.aws", "export_shell_variables", "false"),
 					resource.TestCheckResourceAttr("scalr_provider_configuration.aws", "aws.#", "1"),
 					resource.TestCheckResourceAttr("scalr_provider_configuration.aws", "aws.0.role_arn", "arn:aws:iam::123456789012:role/scalr-oidc-role2"),