Fix tests

pulumi · Oct 16, 2024 · d81c1ee · d81c1ee
1 parent c4cac37
commit d81c1ee
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/examples/examples_nodejs_test.go b/examples/examples_nodejs_test.go
@@ -1080,6 +1080,8 @@ func TestAccScalarTypes(t *testing.T) {
 				// cluster1 runs the default settings with a default node group and an oidc provider
 				require.NotNil(t, info.Outputs["cluster1"])
 				cluster1 := info.Outputs["cluster1"].(map[string]interface{})
+				require.NotNil(t, cluster1["eksCluster"])
+				eksCluster1 := cluster1["eksCluster"].(map[string]interface{})
 
 				require.NotNil(t, cluster1["clusterSecurityGroup"])
 				require.NotNil(t, cluster1["nodeSecurityGroup"])
@@ -1099,18 +1101,18 @@ func TestAccScalarTypes(t *testing.T) {
 				oidcProvider1 := coreData1["oidcProvider"].(map[string]interface{})
 
 				assert.Equal(t, oidcProvider1["arn"], cluster1["oidcProviderArn"])
-				oidcProviderUrl1 := oidcProvider1["url"].(string)
-				assert.Equal(t, oidcProvider1["url"], cluster1["oidcProviderUrl"])
+				oidcProviderUrl1 := getOidcProviderUrl(t, eksCluster1)
+				assert.Equal(t, oidcProviderUrl1, cluster1["oidcProviderUrl"])
 				assert.Equal(t, strings.ReplaceAll(oidcProviderUrl1, "https://", ""), cluster1["oidcIssuer"],
 					"expected oidcIssuer to be the same as the oidcProvider url without the https:// prefix")
 
 				// cluster2 runs with fargate, no default node group, no default security groups and no oidc provider
 				require.NotNil(t, info.Outputs["cluster2"])
 				cluster2 := info.Outputs["cluster2"].(map[string]interface{})
 				require.NotNil(t, cluster2["eksCluster"])
-				eksCluster := cluster2["eksCluster"].(map[string]interface{})
-				require.NotNil(t, eksCluster["vpcConfig"])
-				vpcConfig := eksCluster["vpcConfig"].(map[string]interface{})
+				eksCluster2 := cluster2["eksCluster"].(map[string]interface{})
+				require.NotNil(t, eksCluster2["vpcConfig"])
+				vpcConfig := eksCluster2["vpcConfig"].(map[string]interface{})
 
 				// AWS EKS always creates a security group for the cluster
 				eksSecurityGroupId := vpcConfig["clusterSecurityGroupId"]
@@ -1153,3 +1155,19 @@ func TestAccScalarTypes(t *testing.T) {
 
 	programTestWithExtraOptions(t, &test, nil)
 }
+
+func getOidcProviderUrl(t *testing.T, eksCluster map[string]interface{}) string {
+	require.NotEmpty(t, eksCluster["identities"])
+	identities := eksCluster["identities"].([]interface{})
+	require.NotEmpty(t, identities[0])
+
+	require.Contains(t, identities[0].(map[string]interface{}), "oidcs")
+	require.NotEmpty(t, identities[0].(map[string]interface{})["oidcs"])
+	oidcs := identities[0].(map[string]interface{})["oidcs"].([]interface{})
+
+	require.NotEmpty(t, oidcs[0])
+	require.Contains(t, oidcs[0].(map[string]interface{}), "issuer")
+	require.NotEmpty(t, oidcs[0].(map[string]interface{})["issuer"])
+
+	return oidcs[0].(map[string]interface{})["issuer"].(string)
+}
diff --git a/examples/extra-sg/index.ts b/examples/extra-sg/index.ts
@@ -108,6 +108,6 @@ const ng = new eks.NodeGroupV2("example-mng", {
   amiId: "ami-066e69f6f03b5383e",
   extraNodeSecurityGroups: [
     customSecurityGroup, // Plain type
-    cluster.nodeSecurityGroupId, // Input type
+    cluster.nodeSecurityGroup.apply(sg => sg!), // Input type
   ],
 });
diff --git a/examples/oidc-iam-sa/index.ts b/examples/oidc-iam-sa/index.ts
@@ -32,7 +32,7 @@ export const appsNamespaceName = appsNamespace.metadata.name;
 // Create the new IAM policy for the Service Account using the
 // AssumeRoleWebWebIdentity action.
 const saName = "s3";
-const saAssumeRolePolicy = aws.iam.getPolicyDocument({
+const saAssumeRolePolicy = aws.iam.getPolicyDocumentOutput({
     statements: [{
         actions: ["sts:AssumeRoleWithWebIdentity"],
         conditions: [{