Merge pull request #4859 from linuxfoundation/unicron-fix-serverless-env-vars-fallback-prod

Unicron fix serverless env vars fallback prod

Author: lukaszgryglicki

cla-backend-go/serverless.yml

@@ -223,9 +223,9 @@ provider:
     AUTH0_DOMAIN: ${file(./env.json):auth0-domain, ssm:/cla-auth0-domain-${opt:stage}}
     AUTH0_CLIENT_ID: ${file(./env.json):auth0-clientId, ssm:/cla-auth0-clientId-${opt:stage}}
     AUTH0_USERNAME_CLAIM: ${file(./env.json):auth0-username-claim, ssm:/cla-auth0-username-claim-${opt:stage}}
-    AUTH0_USERNAME_CLAIM_CLI: ${file(./env.json):auth0-username-cli-claim, ssm:/cla-auth0-username-claim-cli-${opt:stage}}
-    AUTH0_EMAIL_CLAIM_CLI: ${file(./env.json):auth0-email-cli-claim, ssm:/cla-auth0-email-claim-cli-${opt:stage}}
-    AUTH0_NAME_CLAIM_CLI: ${file(./env.json):auth0-name-cli-claim, ssm:/cla-auth0-name-claim-cli-${opt:stage}}
+    AUTH0_USERNAME_CLAIM_CLI: ${file(./env.json):auth0-username-cli-claim, ssm:/cla-auth0-username-claim-cli-${opt:stage}, env:AUTH0_USERNAME_CLAIM_CLI, ''}
+    AUTH0_EMAIL_CLAIM_CLI: ${file(./env.json):auth0-email-cli-claim, ssm:/cla-auth0-email-claim-cli-${opt:stage}, env:AUTH0_EMAIL_CLAIM_CLI, ''}
+    AUTH0_NAME_CLAIM_CLI: ${file(./env.json):auth0-name-cli-claim, ssm:/cla-auth0-name-claim-cli-${opt:stage}, env:AUTH0_NAME_CLAIM_CLI, ''}
     AUTH0_ALGORITHM: ${file(./env.json):auth0-algorithm, ssm:/cla-auth0-algorithm-${opt:stage}}
     SF_INSTANCE_URL: ${file(./env.json):sf-instance-url, ssm:/cla-sf-instance-url-${opt:stage}}
     SF_CLIENT_ID: ${file(./env.json):sf-client-id, ssm:/cla-sf-consumer-key-${opt:stage}}

cla-backend/serverless.yml

@@ -312,9 +312,9 @@ provider:
     AUTH0_DOMAIN: ${file(./env.json):auth0-domain, ssm:/cla-auth0-domain-${sls:stage}}
     AUTH0_CLIENT_ID: ${file(./env.json):auth0-clientId, ssm:/cla-auth0-clientId-${sls:stage}}
     AUTH0_USERNAME_CLAIM: ${file(./env.json):auth0-username-claim, ssm:/cla-auth0-username-claim-${sls:stage}}
-    AUTH0_USERNAME_CLAIM_CLI: ${file(./env.json):auth0-username-cli-claim, ssm:/cla-auth0-username-claim-cli-${sls:stage}}
-    AUTH0_EMAIL_CLAIM_CLI: ${file(./env.json):auth0-email-cli-claim, ssm:/cla-auth0-email-claim-cli-${sls:stage}}
-    AUTH0_NAME_CLAIM_CLI: ${file(./env.json):auth0-name-cli-claim, ssm:/cla-auth0-name-claim-cli-${sls:stage}}
+    AUTH0_USERNAME_CLAIM_CLI: ${file(./env.json):auth0-username-cli-claim, ssm:/cla-auth0-username-claim-cli-${sls:stage}, env:AUTH0_USERNAME_CLAIM_CLI, ''}
+    AUTH0_EMAIL_CLAIM_CLI:    ${file(./env.json):auth0-email-cli-claim, ssm:/cla-auth0-email-claim-cli-${sls:stage}, env:AUTH0_EMAIL_CLAIM_CLI, ''}
+    AUTH0_NAME_CLAIM_CLI:     ${file(./env.json):auth0-name-cli-claim, ssm:/cla-auth0-name-claim-cli-${sls:stage}, env:AUTH0_NAME_CLAIM_CLI, ''}
     AUTH0_ALGORITHM: ${file(./env.json):auth0-algorithm, ssm:/cla-auth0-algorithm-${sls:stage}}
     SF_INSTANCE_URL: ${file(./env.json):sf-instance-url, ssm:/cla-sf-instance-url-${sls:stage}}
     SF_CLIENT_ID: ${file(./env.json):sf-client-id, ssm:/cla-sf-consumer-key-${sls:stage}}

utils/set_prod_claims.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+# This is needed for V3 CLA Auth0 setup
+aws --profile lfproduct-prod --region us-east-1 ssm put-parameter --name "/cla-auth0-username-claim-cli-prod" --value "http://lfx.prod/claims/username" --type "String" --overwrite
+aws --profile lfproduct-prod --region us-east-1 ssm put-parameter --name "/cla-auth0-email-claim-cli-prod" --value "http://lfx.prod/claims/email" --type "String" --overwrite
+aws --profile lfproduct-prod --region us-east-1 ssm put-parameter --name "/cla-auth0-name-claim-cli-prod" --value "http://lfx.prod/claims/username" --type "String" --overwrite
+aws --profile lfproduct-prod --region us-east-2 ssm put-parameter --name "/cla-auth0-username-claim-cli-prod" --value "http://lfx.prod/claims/username" --type "String" --overwrite
+aws --profile lfproduct-prod --region us-east-2 ssm put-parameter --name "/cla-auth0-email-claim-cli-prod" --value "http://lfx.prod/claims/email" --type "String" --overwrite
+aws --profile lfproduct-prod --region us-east-2 ssm put-parameter --name "/cla-auth0-name-claim-cli-prod" --value "http://lfx.prod/claims/username" --type "String" --overwrite
+./utils/get_prod_claims.sh