Use new infrastructure

Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>
kedacore · Nov 8, 2022 · 0ea6f66 · 0ea6f66
1 parent 710acf6
commit 0ea6f66
Show file tree

Hide file tree

Showing 37 changed files with 178 additions and 227 deletions.
diff --git a/.github/workflows/pr-e2e.yml b/.github/workflows/pr-e2e.yml
@@ -122,55 +122,17 @@ jobs:
         run: |
           gh pr checkout ${{ needs.triage.outputs.pr_num }}
 
+      - uses: oNaiPs/secrets-to-env-action@v1
+        with:
+          secrets: ${{ toJSON(secrets) }}
+
       - name: Run end to end tests
         continue-on-error: true
         id: test
         env:
-          AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
-          AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
-          AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_RUN_IDENTITY_TESTS: true
-          AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
-          AZURE_APP_INSIGHTS_APP_ID: ${{ secrets.AZURE_APP_INSIGHTS_APP_ID }}
-          AZURE_APP_INSIGHTS_CONNECTION_STRING: ${{ secrets.AZURE_APP_INSIGHTS_CONNECTION_STRING }}
-          AZURE_APP_INSIGHTS_INSTRUMENTATION_KEY: ${{ secrets.AZURE_APP_INSIGHTS_INSTRUMENTATION_KEY }}
-          AZURE_DATA_EXPLORER_DB: ${{ secrets.AZURE_DATA_EXPLORER_DB }}
-          AZURE_DATA_EXPLORER_ENDPOINT: ${{ secrets.AZURE_DATA_EXPLORER_ENDPOINT }}
-          AZURE_DEVOPS_BUILD_DEFINITION_ID: ${{ secrets.AZURE_DEVOPS_BUILD_DEFINITION_ID }}
-          AZURE_DEVOPS_ORGANIZATION_URL: ${{ secrets.AZURE_DEVOPS_ORGANIZATION_URL }}
-          AZURE_DEVOPS_PAT: ${{ secrets.AZURE_DEVOPS_PAT }}
-          AZURE_DEVOPS_POOL_NAME: ${{ secrets.AZURE_DEVOPS_POOL_NAME }}
-          AZURE_DEVOPS_PROJECT: ${{ secrets.AZURE_DEVOPS_PROJECT }}
-          AZURE_EVENTHBUS_MANAGEMENT_CONNECTION_STRING : ${{ secrets.AZURE_EVENTHBUS_MANAGEMENT_CONNECTION_STRING }}
-          AZURE_KEYVAULT_URI:  ${{ secrets.AZURE_KEYVAULT_URI }}
-          AZURE_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE_ID }}
           AZURE_RUN_WORKLOAD_IDENTITY_TESTS: true
-          AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
-          AZURE_SERVICE_BUS_ALTERNATIVE_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_ALTERNATIVE_CONNECTION_STRING }}
-          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
-          AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
-          AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
-          AZURE_SP_ALTERNATIVE_APP_ID: ${{ secrets.AZURE_SP_ALTERNATIVE_APP_ID }}
-          AZURE_SP_ALTERNATIVE_OBJECT_ID: ${{ secrets.AZURE_SP_ALTERNATIVE_OBJECT_ID }}
-          AZURE_SP_ALTERNATIVE_KEY: ${{ secrets.AZURE_SP_ALTERNATIVE_KEY }}
-          AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
-          AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
-          DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY}}
-          DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY}}
-          DATADOG_SITE: ${{ secrets.DATADOG_SITE}}
           E2E_IMAGE_TAG: ${{ needs.triage.outputs.image_tag }}
-          GCP_SP_KEY: ${{ secrets.GCP_SP_KEY }}
-          NEWRELIC_ACCOUNT_ID: ${{ secrets.NEWRELIC_ACCOUNT_ID}}
-          NEWRELIC_API_KEY: ${{ secrets.NEWRELIC_API_KEY}}
-          NEWRELIC_LICENSE: ${{ secrets.NEWRELIC_LICENSE}}
-          OIDC_ISSUER_URL: ${{ secrets.OIDC_ISSUER_URLPR }}
-          OPENSTACK_AUTH_URL: ${{ secrets.OPENSTACK_AUTH_URL }}
-          OPENSTACK_PASSWORD: ${{ secrets.OPENSTACK_PASSWORD }}
-          OPENSTACK_PROJECT_ID: ${{ secrets.OPENSTACK_PROJECT_ID }}
-          OPENSTACK_USER_ID: ${{ secrets.OPENSTACK_USER_ID }}
-          PREDICTKUBE_API_KEY: ${{ secrets.PREDICTKUBE_API_KEY }}
           TEST_CLUSTER_NAME: keda-pr-run
         run: |
           MESSAGE="${{ github.event.comment.body }}"
@@ -186,11 +148,6 @@ jobs:
         if: ${{ always() }}
         run: make e2e-test-clean
         env:
-          AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
-          AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
-          AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
           TEST_CLUSTER_NAME: keda-pr-run
 
       - name: React to comment with success

diff --git a/.github/workflows/pr-terraform-check.yml b/.github/workflows/pr-terraform-check.yml
@@ -0,0 +1,35 @@
+name: Test Terraform
+on:
+  - pull_request
+
+jobs:
+  e2e-tests:
+    name: Run e2e test
+    runs-on: ubuntu-latest
+    # build-tools is built from ../../tools/build-tools.Dockerfile
+    container: ghcr.io/kedacore/build-tools:1.18.6
+    concurrency: e2e-tests
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
+      - name: Register workspace path
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+      - uses: oNaiPs/secrets-to-env-action@v1
+        with:
+          secrets: ${{ toJSON(secrets) }}
+
+      - name: Run end to end tests
+        env:
+          AWS_RUN_IDENTITY_TESTS: true
+          AZURE_RUN_WORKLOAD_IDENTITY_TESTS: true
+          TEST_CLUSTER_NAME: keda-pr-run
+          E2E_TEST_REGEX: "azure*"
+        run: make e2e-test
+
+      - name: Delete all e2e related namespaces
+        if: ${{ always() }}
+        run: make e2e-test-clean
diff --git a/.github/workflows/template-main-e2e-test.yml b/.github/workflows/template-main-e2e-test.yml
@@ -19,60 +19,16 @@ jobs:
       - name: Register workspace path
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
+      - uses: oNaiPs/secrets-to-env-action@v1
+        with:
+          secrets: ${{ toJSON(secrets) }}
+
       - name: Run end to end tests
         env:
-          AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
-          AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
-          AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_RUN_IDENTITY_TESTS: true
-          AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
-          AZURE_APP_INSIGHTS_APP_ID: ${{ secrets.AZURE_APP_INSIGHTS_APP_ID }}
-          AZURE_APP_INSIGHTS_CONNECTION_STRING: ${{ secrets.AZURE_APP_INSIGHTS_CONNECTION_STRING }}
-          AZURE_APP_INSIGHTS_INSTRUMENTATION_KEY: ${{ secrets.AZURE_APP_INSIGHTS_INSTRUMENTATION_KEY }}
-          AZURE_DATA_EXPLORER_DB: ${{ secrets.AZURE_DATA_EXPLORER_DB }}
-          AZURE_DATA_EXPLORER_ENDPOINT: ${{ secrets.AZURE_DATA_EXPLORER_ENDPOINT }}
-          AZURE_DEVOPS_BUILD_DEFINITION_ID: ${{ secrets.AZURE_DEVOPS_BUILD_DEFINITION_ID }}
-          AZURE_DEVOPS_ORGANIZATION_URL: ${{ secrets.AZURE_DEVOPS_ORGANIZATION_URL }}
-          AZURE_DEVOPS_PAT: ${{ secrets.AZURE_DEVOPS_PAT }}
-          AZURE_DEVOPS_POOL_NAME: ${{ secrets.AZURE_DEVOPS_POOL_NAME }}
-          AZURE_DEVOPS_PROJECT: ${{ secrets.AZURE_DEVOPS_PROJECT }}
-          AZURE_EVENTHBUS_MANAGEMENT_CONNECTION_STRING : ${{ secrets.AZURE_EVENTHBUS_MANAGEMENT_CONNECTION_STRING }}
-          AZURE_KEYVAULT_URI:  ${{ secrets.AZURE_KEYVAULT_URI }}
-          AZURE_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE_ID }}
-          AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_RUN_WORKLOAD_IDENTITY_TESTS: true
-          AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
-          AZURE_SERVICE_BUS_ALTERNATIVE_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_ALTERNATIVE_CONNECTION_STRING }}
-          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
-          AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
-          AZURE_SP_ALTERNATIVE_APP_ID: ${{ secrets.AZURE_SP_ALTERNATIVE_APP_ID }}
-          AZURE_SP_ALTERNATIVE_OBJECT_ID: ${{ secrets.AZURE_SP_ALTERNATIVE_OBJECT_ID }}
-          AZURE_SP_ALTERNATIVE_KEY: ${{ secrets.AZURE_SP_ALTERNATIVE_KEY }}
-          AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
-          AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
-          AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
-          DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY}}
-          DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY}}
-          DATADOG_SITE: ${{ secrets.DATADOG_SITE}}
-          GCP_SP_KEY: ${{ secrets.GCP_SP_KEY }}
-          NEWRELIC_ACCOUNT_ID: ${{ secrets.NEWRELIC_ACCOUNT_ID}}
-          NEWRELIC_API_KEY: ${{ secrets.NEWRELIC_API_KEY}}
-          NEWRELIC_LICENSE: ${{ secrets.NEWRELIC_LICENSE}}
-          OIDC_ISSUER_URL: ${{ secrets.OIDC_ISSUER_URLNIGHTLY }}
-          OPENSTACK_AUTH_URL: ${{ secrets.OPENSTACK_AUTH_URL }}
-          OPENSTACK_PASSWORD: ${{ secrets.OPENSTACK_PASSWORD }}
-          OPENSTACK_PROJECT_ID: ${{ secrets.OPENSTACK_PROJECT_ID }}
-          OPENSTACK_USER_ID: ${{ secrets.OPENSTACK_USER_ID }}
-          PREDICTKUBE_API_KEY: ${{ secrets.PREDICTKUBE_API_KEY }}
         run: make e2e-test
 
       - name: Delete all e2e related namespaces
         if: ${{ always() }}
         run: make e2e-test-clean
-        env:
-          AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
-          AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
-          AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
diff --git a/.github/workflows/v1-build.yml b/.github/workflows/v1-build.yml
@@ -37,11 +37,11 @@ jobs:
 
       - name: Run end to end tests
         env:
-          AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
-          AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
-          AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
-          AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
-          AZURE_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE_ID }}
+          TF_AZURE_SUBSCRIPTION: ${{ secrets.TF_AZURE_SUBSCRIPTION }}
+          TF_AZURE_RESOURCE_GROUP: ${{ secrets.TF_AZURE_RESOURCE_GROUP }}
+          TF_AZURE_SP_APP_ID: ${{ secrets.TF_AZURE_SP_APP_ID }}
+          TF_AZURE_SP_KEY: ${{ secrets.TF_AZURE_SP_KEY }}
+          TF_AZURE_SP_TENANT: ${{ secrets.TF_AZURE_SP_TENANT }}
+          TF_AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.TF_AZURE_STORAGE_CONNECTION_STRING }}
+          TF_AZURE_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.TF_AZURE_LOG_ANALYTICS_WORKSPACE_ID }}
         run: make e2e-test
diff --git a/Makefile b/Makefile
@@ -79,11 +79,11 @@ test: manifests generate fmt vet envtest install-test-deps ## Run tests and expo
 
 .PHONY: get-cluster-context
 get-cluster-context: ## Get Azure cluster context.
-	@az login --service-principal -u $(AZURE_SP_APP_ID) -p "$(AZURE_SP_KEY)" --tenant $(AZURE_SP_TENANT)
+	@az login --service-principal -u $(TF_AZURE_SP_APP_ID) -p "$(TF_AZURE_SP_KEY)" --tenant $(TF_AZURE_SP_TENANT)
 	@az aks get-credentials \
 		--name $(TEST_CLUSTER_NAME) \
-		--subscription $(AZURE_SUBSCRIPTION) \
-		--resource-group $(AZURE_RESOURCE_GROUP)
+		--subscription $(TF_AZURE_SUBSCRIPTION) \
+		--resource-group $(TF_AZURE_RESOURCE_GROUP)
 
 .PHONY: e2e-test
 e2e-test: get-cluster-context ## Run e2e tests against Azure cluster.
@@ -252,7 +252,7 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 	if [ "$(AZURE_RUN_WORKLOAD_IDENTITY_TESTS)" = true ]; then \
 		cd config/service_account && \
 		$(KUSTOMIZE) edit add label --force azure.workload.identity/use:true; \
-		$(KUSTOMIZE) edit add annotation --force azure.workload.identity/client-id:${AZURE_SP_APP_ID} azure.workload.identity/tenant-id:${AZURE_SP_TENANT}; \
+		$(KUSTOMIZE) edit add annotation --force azure.workload.identity/client-id:${TF_AZURE_IDENTITY_1_APP_ID} azure.workload.identity/tenant-id:${TF_AZURE_SP_TENANT}; \
 	fi
 	if [ "$(AWS_RUN_IDENTITY_TESTS)" = true ]; then \
 		cd config/service_account && \

diff --git a/tests/.env b/tests/.env
@@ -3,27 +3,27 @@
 AWS_ACCESS_KEY=
 AWS_REGION=
 AWS_SECRET_KEY=
-AZURE_APP_INSIGHTS_APP_ID=
-AZURE_APP_INSIGHTS_CONNECTION_STRING=
-AZURE_APP_INSIGHTS_INSTRUMENTATION_KEY=
-AZURE_DATA_EXPLORER_DB=
-AZURE_DATA_EXPLORER_ENDPOINT=
+TF_AZURE_APP_INSIGHTS_APP_ID=
+TF_AZURE_APP_INSIGHTS_CONNECTION_STRING=
+TF_AZURE_APP_INSIGHTS_INSTRUMENTATION_KEY=
+TF_AZURE_DATA_EXPLORER_DB=
+TF_AZURE_DATA_EXPLORER_ENDPOINT=
 AZURE_DEVOPS_BUILD_DEFINITION_ID=
 AZURE_DEVOPS_ORGANIZATION_URL=
 AZURE_DEVOPS_PAT=
 AZURE_DEVOPS_POOL_NAME=
 AZURE_DEVOPS_PROJECT=
-AZURE_EVENTHBUS_MANAGEMENT_CONNECTION_STRING=
-AZURE_KEYVAULT_URI=
-AZURE_LOG_ANALYTICS_WORKSPACE_ID=
-AZURE_RESOURCE_GROUP=
-AZURE_SERVICE_BUS_CONNECTION_STRING=
-AZURE_SP_APP_ID=
-AZURE_SP_KEY=
-AZURE_SP_OBJECT_ID=
-AZURE_SP_TENANT=
-AZURE_STORAGE_CONNECTION_STRING=
-AZURE_SUBSCRIPTION=
+TF_AZURE_EVENTHBUS_MANAGEMENT_CONNECTION_STRING=
+TF_AZURE_KEYVAULT_URI=
+TF_AZURE_LOG_ANALYTICS_WORKSPACE_ID=
+TF_AZURE_RESOURCE_GROUP=
+TF_AZURE_SERVICE_BUS_CONNECTION_STRING=
+TF_AZURE_SP_APP_ID=
+TF_AZURE_SP_KEY=
+TF_AZURE_SP_OBJECT_ID=
+TF_AZURE_SP_TENANT=
+TF_AZURE_STORAGE_CONNECTION_STRING=
+TF_AZURE_SUBSCRIPTION=
 DATADOG_APP_KEY=
 DATADOG_API_KEY=
 DATADOG_SITE=

diff --git a/tests/README.md b/tests/README.md
@@ -2,7 +2,7 @@
 
 - [go](https://go.dev/)
 - `kubectl` logged into a Kubernetes cluster.
-- Each scaler test might define additional requirements. For example, `azure_queue_test.go` requires an env var `AZURE_STORAGE_CONNECTION_STRING`
+- Each scaler test might define additional requirements. For example, `azure_queue_test.go` requires an env var `TF_AZURE_STORAGE_CONNECTION_STRING`
 
 ## Running tests:
 

diff --git a/tests/helper/helper.go b/tests/helper/helper.go
@@ -8,7 +8,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"math/rand"
 	"os"
 	"os/exec"
 	"regexp"
@@ -47,15 +46,18 @@ const (
 
 var _ = godotenv.Load()
 
-var random = rand.New(rand.NewSource(time.Now().UnixNano()))
-
 // Env variables required for setup and cleanup.
 var (
-	AzureADTenantID               = os.Getenv("AZURE_SP_TENANT")
+	AzureADTenantID               = os.Getenv("TF_AZURE_SP_TENANT")
 	AzureRunWorkloadIdentityTests = os.Getenv("AZURE_RUN_WORKLOAD_IDENTITY_TESTS")
 	AwsIdentityTests              = os.Getenv("AWS_RUN_IDENTITY_TESTS")
 )
 
+// Cluster to split upstream resources for each cluster
+var (
+	Cluster = os.Getenv("TEST_CLUSTER_NAME")
+)
+
 var (
 	KubeClient     *kubernetes.Clientset
 	KedaKubeClient *v1alpha1.KedaV1alpha1Client
@@ -495,8 +497,11 @@ func DeleteKubernetesResources(t *testing.T, kc *kubernetes.Clientset, nsName st
 	assert.Truef(t, deleted, "%s namespace not deleted", nsName)
 }
 
-func GetRandomNumber() int {
-	return random.Intn(10000)
+func GetClusterSuffix() string {
+	if Cluster == "" {
+		return "local"
+	}
+	return Cluster
 }
 
 func RemoveANSI(input string) string {

diff --git a/tests/scalers/aws/aws_cloudwatch/aws_cloudwatch_test.go b/tests/scalers/aws/aws_cloudwatch/aws_cloudwatch_test.go
@@ -130,7 +130,7 @@ var (
 	deploymentName                 = fmt.Sprintf("%s-deployment", testName)
 	scaledObjectName               = fmt.Sprintf("%s-so", testName)
 	secretName                     = fmt.Sprintf("%s-secret", testName)
-	cloudwatchMetricName           = fmt.Sprintf("%s-keda-metric-%d", testName, GetRandomNumber())
+	cloudwatchMetricName           = fmt.Sprintf("%s-keda-metric-%s", testName, GetClusterSuffix())
 	awsAccessKeyID                 = os.Getenv("AWS_ACCESS_KEY")
 	awsSecretAccessKey             = os.Getenv("AWS_SECRET_KEY")
 	awsRegion                      = os.Getenv("AWS_REGION")

diff --git a/tests/scalers/aws/aws_cloudwatch_expression/aws_cloudwatch_expression_test.go b/tests/scalers/aws/aws_cloudwatch_expression/aws_cloudwatch_expression_test.go
@@ -128,7 +128,7 @@ var (
 	deploymentName                 = fmt.Sprintf("%s-deployment", testName)
 	scaledObjectName               = fmt.Sprintf("%s-so", testName)
 	secretName                     = fmt.Sprintf("%s-secret", testName)
-	cloudwatchMetricName           = fmt.Sprintf("%s-keda-metric-%d", testName, GetRandomNumber())
+	cloudwatchMetricName           = fmt.Sprintf("%s-keda-metric-%s", testName, GetClusterSuffix())
 	awsAccessKeyID                 = os.Getenv("AWS_ACCESS_KEY")
 	awsSecretAccessKey             = os.Getenv("AWS_SECRET_KEY")
 	awsRegion                      = os.Getenv("AWS_REGION")

diff --git a/tests/scalers/aws/aws_cloudwatch_pod_identity/aws_cloudwatch_pod_identity_test.go b/tests/scalers/aws/aws_cloudwatch_pod_identity/aws_cloudwatch_pod_identity_test.go
@@ -117,7 +117,7 @@ var (
 	deploymentName                 = fmt.Sprintf("%s-deployment", testName)
 	scaledObjectName               = fmt.Sprintf("%s-so", testName)
 	secretName                     = fmt.Sprintf("%s-secret", testName)
-	cloudwatchMetricName           = fmt.Sprintf("%s-keda-metric-%d", testName, GetRandomNumber())
+	cloudwatchMetricName           = fmt.Sprintf("%s-keda-metric-%s", testName, GetClusterSuffix())
 	awsAccessKeyID                 = os.Getenv("AWS_ACCESS_KEY")
 	awsSecretAccessKey             = os.Getenv("AWS_SECRET_KEY")
 	awsRegion                      = os.Getenv("AWS_REGION")

diff --git a/tests/scalers/aws/aws_dynamodb/aws_dynamodb_test.go b/tests/scalers/aws/aws_dynamodb/aws_dynamodb_test.go
@@ -129,7 +129,7 @@ var (
 	deploymentName            = fmt.Sprintf("%s-deployment", testName)
 	scaledObjectName          = fmt.Sprintf("%s-so", testName)
 	secretName                = fmt.Sprintf("%s-secret", testName)
-	dynamoDBTableName         = fmt.Sprintf("%s-keda-table-%d", testName, GetRandomNumber())
+	dynamoDBTableName         = fmt.Sprintf("%s-keda-table-%s", testName, GetClusterSuffix())
 	awsAccessKeyID            = os.Getenv("AWS_ACCESS_KEY")
 	awsSecretAccessKey        = os.Getenv("AWS_SECRET_KEY")
 	awsRegion                 = os.Getenv("AWS_REGION")

diff --git a/tests/scalers/aws/aws_dynamodb_pod_identity/aws_dynamodb_pod_identity_test.go b/tests/scalers/aws/aws_dynamodb_pod_identity/aws_dynamodb_pod_identity_test.go
@@ -116,7 +116,7 @@ var (
 	deploymentName            = fmt.Sprintf("%s-deployment", testName)
 	scaledObjectName          = fmt.Sprintf("%s-so", testName)
 	secretName                = fmt.Sprintf("%s-secret", testName)
-	dynamoDBTableName         = fmt.Sprintf("%s-keda-table-%d", testName, GetRandomNumber())
+	dynamoDBTableName         = fmt.Sprintf("%s-keda-table-%s", testName, GetClusterSuffix())
 	awsAccessKeyID            = os.Getenv("AWS_ACCESS_KEY")
 	awsSecretAccessKey        = os.Getenv("AWS_SECRET_KEY")
 	awsRegion                 = os.Getenv("AWS_REGION")

diff --git a/tests/scalers/aws/aws_dynamodb_streams/aws_dynamodb_streams_test.go b/tests/scalers/aws/aws_dynamodb_streams/aws_dynamodb_streams_test.go
@@ -43,7 +43,7 @@ var (
 	deploymentName       = fmt.Sprintf("%s-deployment", testName)
 	triggerAuthName      = fmt.Sprintf("%s-ta", testName)
 	scaledObjectName     = fmt.Sprintf("%s-so", testName)
-	tableName            = fmt.Sprintf("%s-table-%d", testName, GetRandomNumber())
+	tableName            = fmt.Sprintf("%s-table-%s", testName, GetClusterSuffix())
 	shardCount           = 2 // default count
 	activationShardCount = 0 // default count
 )

diff --git a/...s/scalers/aws/aws_dynamodb_streams_pod_identity/aws_dynamodb_streams_pod_identity_test.go b/...s/scalers/aws/aws_dynamodb_streams_pod_identity/aws_dynamodb_streams_pod_identity_test.go
@@ -43,7 +43,7 @@ var (
 	deploymentName       = fmt.Sprintf("%s-deployment", testName)
 	triggerAuthName      = fmt.Sprintf("%s-ta", testName)
 	scaledObjectName     = fmt.Sprintf("%s-so", testName)
-	tableName            = fmt.Sprintf("%s-table-%d", testName, GetRandomNumber())
+	tableName            = fmt.Sprintf("%s-table-%s", testName, GetClusterSuffix())
 	shardCount           = 2 // default count
 	activationShardCount = 0 // default count
 )

diff --git a/tests/scalers/aws/aws_kinesis_stream/aws_kinesis_stream_test.go b/tests/scalers/aws/aws_kinesis_stream/aws_kinesis_stream_test.go
@@ -127,7 +127,7 @@ var (
 	deploymentName     = fmt.Sprintf("%s-deployment", testName)
 	scaledObjectName   = fmt.Sprintf("%s-so", testName)
 	secretName         = fmt.Sprintf("%s-secret", testName)
-	kinesisStreamName  = fmt.Sprintf("%s-keda-stream-%d", testName, GetRandomNumber())
+	kinesisStreamName  = fmt.Sprintf("%s-keda-stream-%s", testName, GetClusterSuffix())
 	awsAccessKeyID     = os.Getenv("AWS_ACCESS_KEY")
 	awsSecretAccessKey = os.Getenv("AWS_SECRET_KEY")
 	awsRegion          = os.Getenv("AWS_REGION")

diff --git a/tests/scalers/aws/aws_kinesis_stream_pod_identity/aws_kinesis_stream_pod_identity_test.go b/tests/scalers/aws/aws_kinesis_stream_pod_identity/aws_kinesis_stream_pod_identity_test.go
@@ -114,7 +114,7 @@ var (
 	deploymentName     = fmt.Sprintf("%s-deployment", testName)
 	scaledObjectName   = fmt.Sprintf("%s-so", testName)
 	secretName         = fmt.Sprintf("%s-secret", testName)
-	kinesisStreamName  = fmt.Sprintf("%s-keda-stream-%d", testName, GetRandomNumber())
+	kinesisStreamName  = fmt.Sprintf("%s-keda-stream-%s", testName, GetClusterSuffix())
 	awsAccessKeyID     = os.Getenv("AWS_ACCESS_KEY")
 	awsSecretAccessKey = os.Getenv("AWS_SECRET_KEY")
 	awsRegion          = os.Getenv("AWS_REGION")