Merge pull request #1466 from splunk/bugfix/CSPL-3534

kasiakoziol · web-flow · commit 6f4d4636a0df · 2025-03-13T13:10:37.000+01:00
CSPL-3534 Fixing string processing in cluster script
diff --git a/test/deploy-eks-cluster.sh b/test/deploy-eks-cluster.sh
@@ -107,13 +107,13 @@ function createCluster() {
         {
           \"Effect\": \"Allow\",
           \"Principal\": {
-            \"Federated\": \"arn:aws:iam::$account_id:oidc-provider/$oidc_provider\"
+            \"Federated\": \"arn:aws:iam::${account_id}:oidc-provider/${oidc_provider}\"
           },
           \"Action\": \"sts:AssumeRoleWithWebIdentity\",
           \"Condition\": {
             \"StringEquals\": {
-              \"$oidc_provider:aud\": \"sts.amazonaws.com\",
-              \"$oidc_provider:sub\": \"system:serviceaccount:$namespace:$service_account\"
+              \"${oidc_provider}:aud\": \"sts.amazonaws.com\",
+              \"${oidc_provider}:sub\": \"system:serviceaccount:${namespace}:${service_account}\"
             }
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,13 @@ function createCluster() {`
`107`	`107`	`{`
`108`	`108`	`\"Effect\": \"Allow\",`
`109`	`109`	`\"Principal\": {`
`110`		`- \"Federated\": \"arn:aws:iam::$account_id:oidc-provider/$oidc_provider\"`
	`110`	`+ \"Federated\": \"arn:aws:iam::${account_id}:oidc-provider/${oidc_provider}\"`
`111`	`111`	`},`
`112`	`112`	`\"Action\": \"sts:AssumeRoleWithWebIdentity\",`
`113`	`113`	`\"Condition\": {`
`114`	`114`	`\"StringEquals\": {`
`115`		`- \"$oidc_provider:aud\": \"sts.amazonaws.com\",`
`116`		`- \"$oidc_provider:sub\": \"system:serviceaccount:$namespace:$service_account\"`
	`115`	`+ \"${oidc_provider}:aud\": \"sts.amazonaws.com\",`
	`116`	`+ \"${oidc_provider}:sub\": \"system:serviceaccount:${namespace}:${service_account}\"`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`