Merge pull request #643 from amplify-education/hotfix/remove-random-s…

…tring-from-sls-service Remove RANDOM_STRING to reduce SLS credits usage
amplify-education · Nov 25, 2024 · e115e6f · e115e6f
2 parents ef35af9 + 029261b
commit e115e6f
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 53 deletions.
diff --git a/test/integration-tests/basic/apigateway-with-export/serverless.yml b/test/integration-tests/basic/apigateway-with-export/serverless.yml
@@ -1,5 +1,5 @@
 # APIGateway with export outputs
-service: ${env:PLUGIN_IDENTIFIER}-apigateway-with-export-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-apigateway-with-export
 
 frameworkVersion: "4.2.5"
 
@@ -27,23 +27,23 @@ resources:
       Value:
         Ref: ApiGatewayRestApi # Logical ID
       Export:
-        Name: api-${self:provider.stage}-${env:RANDOM_STRING}-restApiId
+        Name: api-${self:provider.stage}-restApiId
     RootResource:
       Description: Main service's API Gateway Root Resource ID
       Value:
         Fn::GetAtt:
           - ApiGatewayRestApi # Logical ID
           - RootResourceId # Logical ID
       Export:
-        Name: api-${self:provider.stage}-${env:RANDOM_STRING}-RootResourceId
+        Name: api-${self:provider.stage}-RootResourceId
 
 plugins:
   - serverless-domain-manager
 
 custom:
   customDomain:
     stage: ${self:provider.stage}
-    domainName: ${env:PLUGIN_IDENTIFIER}-apigateway-with-export-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-apigateway-with-export.${env:TEST_DOMAIN}
     autoDomain: true
     basePath: hello-world
     endpointType: REGIONAL

diff --git a/test/integration-tests/basic/apigateway-with-import/serverless.yml b/test/integration-tests/basic/apigateway-with-import/serverless.yml
@@ -1,5 +1,5 @@
 # APIGateway with import other CloudFormation stack outputs
-service: ${env:PLUGIN_IDENTIFIER}-apigateway-with-import-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-apigateway-with-import
 
 frameworkVersion: "4.2.5"
 
@@ -12,9 +12,9 @@ provider:
   stage: test
   apiGateway:
     restApiId:
-      Fn::ImportValue: api-${self:provider.stage}-${env:RANDOM_STRING}-restApiId
+      Fn::ImportValue: api-${self:provider.stage}-restApiId
     restApiRootResourceId:
-      Fn::ImportValue: api-${self:provider.stage}-${env:RANDOM_STRING}-RootResourceId
+      Fn::ImportValue: api-${self:provider.stage}-RootResourceId
 functions:
   helloWorld:
     handler: handler.helloWorld

diff --git a/test/integration-tests/basic/basepath-mapping/serverless.yml b/test/integration-tests/basic/basepath-mapping/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled and testing basepath mapping
-service: ${env:PLUGIN_IDENTIFIER}-basepath-mapping-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-basepath-mapping
 
 frameworkVersion: "4.2.5"
 
@@ -27,7 +27,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-basepath-mapping-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-basepath-mapping.${env:TEST_DOMAIN}
     basePath: 'api'
 
 package:

diff --git a/test/integration-tests/basic/create-domain-idempotent/serverless.yml b/test/integration-tests/basic/create-domain-idempotent/serverless.yml
@@ -1,5 +1,5 @@
 # Creating a domain should be idempotent
-service: ${env:PLUGIN_IDENTIFIER}-create-domain-idempotent-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-create-domain-idempotent
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-create-domain-idempotent-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-create-domain-idempotent.${env:TEST_DOMAIN}
     basePath: ''
 
 package:

diff --git a/test/integration-tests/basic/deploy-idempotent/serverless.yml b/test/integration-tests/basic/deploy-idempotent/serverless.yml
@@ -1,5 +1,5 @@
 # Deploying should be idempotent
-service: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent.${env:TEST_DOMAIN}
     basePath: ''
 
 package:

diff --git a/test/integration-tests/basic/deploy-idempotent2/serverless.yml b/test/integration-tests/basic/deploy-idempotent2/serverless.yml
@@ -1,5 +1,5 @@
 # Deploying should be idempotent for the same domain and different paths
-service: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent2-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent2
 
 frameworkVersion: "4.2.5"
 
@@ -25,11 +25,11 @@ custom:
     - rest:
       autoDomain: true
       basePath: "path1"
-      domainName: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent2-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+      domainName: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent2.${env:TEST_DOMAIN}
       allowPathMatching: true
     - rest:
       basePath: "path2"
-      domainName: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent2-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+      domainName: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent2.${env:TEST_DOMAIN}
       allowPathMatching: true
 
 package:

diff --git a/test/integration-tests/basic/http-api-multiple/serverless.yml b/test/integration-tests/basic/http-api-multiple/serverless.yml
@@ -1,4 +1,4 @@
-service: ${env:PLUGIN_IDENTIFIER}-http-api-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-http-api
 
 frameworkVersion: "4.2.5"
 
@@ -26,12 +26,12 @@ plugins:
 custom:
   customDomains:
     - http:
-        domainName: ${env:PLUGIN_IDENTIFIER}-http-api-multi-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+        domainName: ${env:PLUGIN_IDENTIFIER}-http-api-multi.${env:TEST_DOMAIN}
         basePath: ''
         endpointType: REGIONAL
         autoDomain: true
     - http:
-        domainName: ${env:PLUGIN_IDENTIFIER}-http-api-milti2-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+        domainName: ${env:PLUGIN_IDENTIFIER}-http-api-milti2.${env:TEST_DOMAIN}
         basePath: ''
         endpointType: REGIONAL
         autoDomain: true

diff --git a/test/integration-tests/basic/mutual-tls/serverless.yml b/test/integration-tests/basic/mutual-tls/serverless.yml
@@ -1,4 +1,4 @@
-service: ${env:PLUGIN_IDENTIFIER}-mutual-tls-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-mutual-tls
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
 
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-mutual-tls-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-mutual-tls.${env:TEST_DOMAIN}
     autoDomain: true
     endpointType: REGIONAL
     tlsTruststoreUri: ${env:TLS_TRUSTSTORE_URI}

diff --git a/test/integration-tests/basic/null-basepath-mapping/serverless.yml b/test/integration-tests/basic/null-basepath-mapping/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled and testing basepath mapping
-service: ${env:PLUGIN_IDENTIFIER}-null-basepath-mapping-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-null-basepath-mapping
 
 frameworkVersion: "4.2.5"
 
@@ -27,7 +27,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-null-basepath-mapping-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-null-basepath-mapping.${env:TEST_DOMAIN}
     basePath: ''
 
 package:

diff --git a/test/integration-tests/basic/route53-profile/serverless.yml b/test/integration-tests/basic/route53-profile/serverless.yml
@@ -1,5 +1,5 @@
 # Creating a domain should be idempotent
-service: ${env:PLUGIN_IDENTIFIER}-route53-profile-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-route53-profile
 
 frameworkVersion: "4.2.5"
 
@@ -23,7 +23,7 @@ plugins:
 
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-route53-profile-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-route53-profile.${env:TEST_DOMAIN}
     route53Profile: ${env:ROUTE53_PROFILE}
 
 package:

diff --git a/test/integration-tests/deploy/auto-domain/serverless.yml b/test/integration-tests/deploy/auto-domain/serverless.yml
@@ -1,5 +1,5 @@
 # create_domain should be run as part of deployment
-service: ${env:PLUGIN_IDENTIFIER}-auto-domain-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-auto-domain
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-auto-domain-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-auto-domain.${env:TEST_DOMAIN}
     basePath: ''
     autoDomain: true
     autoDomainWaitFor: 120

diff --git a/test/integration-tests/deploy/basepath-nested-stack/serverless.yml b/test/integration-tests/deploy/basepath-nested-stack/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled with custom basepath
-service: ${env:PLUGIN_IDENTIFIER}-basepath-nested-stack-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-basepath-nested-stack
 
 frameworkVersion: "4.2.5"
 
@@ -23,7 +23,7 @@ plugins:
   - serverless-plugin-split-stacks
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-basepath-nested-stack-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-basepath-nested-stack.${env:TEST_DOMAIN}
     basePath: 'api'
     stage: ${self:provider.stage}
     createRoute53Record: true

diff --git a/test/integration-tests/deploy/basepath/serverless.yml b/test/integration-tests/deploy/basepath/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled with custom basepath
-service: ${env:PLUGIN_IDENTIFIER}-basepath-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-basepath
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-basepath-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-basepath.${env:TEST_DOMAIN}
     basePath: 'api'
 
 package:

diff --git a/test/integration-tests/deploy/custom-apigateway/serverless.yml b/test/integration-tests/deploy/custom-apigateway/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled with default values
-service: ${env:PLUGIN_IDENTIFIER}-custom-apigateway-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-custom-apigateway
 
 frameworkVersion: "4.2.5"
 
@@ -27,7 +27,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-custom-apigateway-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-custom-apigateway.${env:TEST_DOMAIN}
 
 package:
   patterns:

diff --git a/test/integration-tests/deploy/default/serverless.yml b/test/integration-tests/deploy/default/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled with default values
-service: ${env:PLUGIN_IDENTIFIER}-default-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-default
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-default-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-default.${env:TEST_DOMAIN}
 
 package:
   patterns:

diff --git a/test/integration-tests/deploy/http-api/serverless.yml b/test/integration-tests/deploy/http-api/serverless.yml
@@ -1,4 +1,4 @@
-service: ${env:PLUGIN_IDENTIFIER}-http-api-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-http-api
 
 frameworkVersion: "4.2.5"
 
@@ -20,7 +20,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-http-api-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-http-api.${env:TEST_DOMAIN}
     endpointType: REGIONAL
     apiType: http
     # the stage should be set to $default for the base path (none)

diff --git a/test/integration-tests/deploy/regional-basepath/serverless.yml b/test/integration-tests/deploy/regional-basepath/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled with regional endpoint, custom basePath
-service: ${env:PLUGIN_IDENTIFIER}-regional-basepath-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-regional-basepath
 
 frameworkVersion: "4.2.5"
 
@@ -23,7 +23,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-regional-basepath-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-regional-basepath.${env:TEST_DOMAIN}
     basePath: 'api'
     endpointType: REGIONAL
 

diff --git a/test/integration-tests/deploy/regional-stage-basepath/serverless.yml b/test/integration-tests/deploy/regional-stage-basepath/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled with regional endpoint, custom stage, empty basepath
-service: ${env:PLUGIN_IDENTIFIER}-regional-stage-basepath-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-regional-stage-basepath
 
 frameworkVersion: "4.2.5"
 
@@ -23,7 +23,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-regional-stage-basepath-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-regional-stage-basepath.${env:TEST_DOMAIN}
     stage: test
     basePath: ''
     endpointType: REGIONAL

diff --git a/test/integration-tests/deploy/regional-tls-1-0/serverless.yml b/test/integration-tests/deploy/regional-tls-1-0/serverless.yml
@@ -1,5 +1,5 @@
 # Test regional domains with TLS 1.0
-service: ${env:PLUGIN_IDENTIFIER}-regional-tls-1-0-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-regional-tls-1-0
 
 frameworkVersion: "4.2.5"
 
@@ -24,7 +24,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-regional-tls-1-0-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-regional-tls-1-0.${env:TEST_DOMAIN}
     securityPolicy: tls_1_0
     endpointType: REGIONAL
 

diff --git a/test/integration-tests/deploy/route-53-latency-routing/serverless.yml b/test/integration-tests/deploy/route-53-latency-routing/serverless.yml
@@ -1,4 +1,4 @@
-service: ${env:PLUGIN_IDENTIFIER}-route-53-latency-routing-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-route-53-latency-routing
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-route-53-latency-routing-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-route-53-latency-routing.${env:TEST_DOMAIN}
     endpointType: REGIONAL
     route53Params:
       routingPolicy: latency

diff --git a/test/integration-tests/deploy/route-53-weighted-routing/serverless.yml b/test/integration-tests/deploy/route-53-weighted-routing/serverless.yml
@@ -1,4 +1,4 @@
-service: ${env:PLUGIN_IDENTIFIER}-route-53-weighted-routing-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-route-53-weighted-routing
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-route-53-weighted-routing-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-route-53-weighted-routing.${env:TEST_DOMAIN}
     endpointType: REGIONAL
     route53Params:
       routingPolicy: weighted

diff --git a/test/integration-tests/deploy/split-horizon-dns/serverless.yml b/test/integration-tests/deploy/split-horizon-dns/serverless.yml
@@ -1,4 +1,4 @@
-service: ${env:PLUGIN_IDENTIFIER}-split-horizon-dns-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-split-horizon-dns
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-split-horizon-dns-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-split-horizon-dns.${env:TEST_DOMAIN}
     endpointType: REGIONAL
     splitHorizonDns: true
 package:

diff --git a/test/integration-tests/deploy/stage-basepath/serverless.yml b/test/integration-tests/deploy/stage-basepath/serverless.yml
@@ -1,5 +1,5 @@
 # Enabled with custom stage and empty basepath
-service: ${env:PLUGIN_IDENTIFIER}-stage-basepath-${env:RANDOM_STRING}
+service: ${env:PLUGIN_IDENTIFIER}-stage-basepath
 
 frameworkVersion: "4.2.5"
 
@@ -22,7 +22,7 @@ plugins:
   - serverless-domain-manager
 custom:
   customDomain:
-    domainName: ${env:PLUGIN_IDENTIFIER}-stage-basepath-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
+    domainName: ${env:PLUGIN_IDENTIFIER}-stage-basepath.${env:TEST_DOMAIN}
     stage: test
     basePath: ''