fix: replacing

lara-learning · Dec 17, 2024 · c405d1b · c405d1b
1 parent d07bd66
commit c405d1b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/reusable-deploy-job.yml b/.github/workflows/reusable-deploy-job.yml
@@ -78,6 +78,11 @@ jobs:
           role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/github-deploy-user
           role-session-name: github-deployment
 
+      - name: Set environment variables without https
+        run: |
+          echo "FRONTEND_URL_WITHOUT_HTTPS=$(echo ${{ secrets.FRONTEND_URL }} | sed 's/^https:\/\///')" >> $GITHUB_ENV
+          echo "BACKEND_URL_WITHOUT_HTTPS=$(echo ${{ secrets.BACKEND_URL }} | sed 's/^https:\/\///')" >> $GITHUB_ENV
+
       - name: Deploy Frontend
         run: serverless s3sync bucket --bucket ${{ secrets.COMPANY_ABBREVIATION }}-lara-frontend-${{ inputs.target }}
 

diff --git a/serverless.yml b/serverless.yml
@@ -80,9 +80,6 @@ custom:
     ses:
       region: ${self:provider.environment.SES_REGION, self:provider.region}
 
-  frontendUrlWithoutHttps: ${self:provider.environment.FRONTEND_URL.replace("https://", "")}
-  backendUrlWithoutHttps: ${self:provider.environment.BACKEND_URL.replace("https://", "")}
-
 package:
   individually: true
   excludeDevDependencies: true
@@ -268,10 +265,10 @@ resources:
       Type: AWS::CertificateManager::Certificate
       Condition: IsProductionOrStaging
       Properties:
-        DomainName: ${self:custom.frontendUrlWithoutHttps}
+        DomainName: ${self:custom.FRONTEND_URL_WITHOUT_HTTPS}
         ValidationMethod: DNS
         DomainValidationOptions:
-          - DomainName: ${self:custom.frontendUrlWithoutHttps}
+          - DomainName: ${self:custom.FRONTEND_URL_WITHOUT_HTTPS}
             HostedZoneId: ${self:provider.environment.HOSTED_ZONE_ID}
         Tags:
           - Key: Name
@@ -281,10 +278,10 @@ resources:
       Type: AWS::CertificateManager::Certificate
       Condition: IsProductionOrStaging
       Properties:
-        DomainName: ${self:custom.backendUrlWithoutHttps}
+        DomainName: ${self:custom.BACKEND_URL_WITHOUT_HTTPS}
         ValidationMethod: DNS
         DomainValidationOptions:
-          - DomainName: ${self:custom.backendUrlWithoutHttps}
+          - DomainName: ${self:custom.BACKEND_URL_WITHOUT_HTTPS}
             HostedZoneId: ${self:provider.environment.HOSTED_ZONE_ID}
         Tags:
           - Key: Name