Skip to content

Commit

Permalink
initialize formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
BearHanded committed Jul 5, 2024
1 parent f657ab3 commit 90a46dc
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 26 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ jobs:
${{github.workspace}}/tests/screenshots/
${{github.workspace}}/tests/videos/
retention-days: 14

a11y-tests:
name: E2E A11y Tests
needs:
Expand Down Expand Up @@ -272,7 +272,6 @@ jobs:
${{github.workspace}}/tests/videos/
retention-days: 14


test:
name: Playwright Tests
needs:
Expand Down Expand Up @@ -317,7 +316,7 @@ jobs:
retention-days: 30

upload-reports:
name: Uppload Reports
name: Upload Reports
needs:
- test
if: always()
Expand Down Expand Up @@ -347,10 +346,10 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./downloaded-html-report # publish downloaded dir to github pages
destination_dir: ${{ steps.timestampid.outputs.timestamp }}
# need to extract just org name for reassembling the github pages URL
# need to extract just org name for reassembling the github pages URL
- name: Extract Organization Name
id: extract-org
run: |
run: |
echo "ORG_NAME=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)" >> $GITHUB_ENV
echo "org name: ${ORG_NAME}"
# need to extract just the repo name for reassembling the github pages URL
Expand All @@ -365,7 +364,6 @@ jobs:
echo "## Playwright Test Results" >> $GITHUB_STEP_SUMMARY
echo "https://${ORG_NAME}.github.io/${REPO_NAME}/${{ steps.timestampid.outputs.timestamp }}/" >> $GITHUB_STEP_SUMMARY
cleanup:
name: Delist GHA Runner CIDR Blocks
if: ${{ github.ref_name != 'main' && github.ref_name != 'val' && github.ref_name != 'production' }}
Expand Down
40 changes: 20 additions & 20 deletions services/ui-src/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ custom:
- main
- val
- production
# api_region: ${param:ApiRegion}
# api_url: ${param:ApiGatewayRestApiUrl}
api_region: ${param:ApiRegion, ""}
api_url: ${param:ApiGatewayRestApiUrl, ""}
application_endpoint: ${env:APPLICATION_ENDPOINT, ssm:/${self:custom.stage}/ui/application_endpoint, ssm:/default/ui/application_endpoint}
# cognito_region: ${param:CognitoRegion}
# cognito_identity_pool_id: ${param:IdentityPoolId}
# cognito_user_pool_id: ${param:UserPoolId}
# cognito_user_pool_client_id: ${param:UserPoolClientId}
# cognito_user_pool_client_domain: ${param:UserPoolClientDomain}
# cognito_idp_name: ${env:COGNITO_IDP_NAME, ssm:/${self:custom.stage}/ui-auth/cognito_idp_name, ssm:/default/ui-auth/cognito_idp_name}
# cognito_idp: ${param:IdentityProvider}
cognito_region: ${param:CognitoRegion, ""}
cognito_identity_pool_id: ${param:IdentityPoolId, ""}
cognito_user_pool_id: ${param:UserPoolId, ""}
cognito_user_pool_client_id: ${param:UserPoolClientId, ""}
cognito_user_pool_client_domain: ${param:UserPoolClientDomain, ""}
cognito_idp_name: ${env:COGNITO_IDP_NAME, ssm:/${self:custom.stage}/ui-auth/cognito_idp_name, ssm:/default/ui-auth/cognito_idp_name}
cognito_idp: ${param:IdentityProvider, ""}
ldSdkClient: ${env:REACT_APP_LD_SDK_CLIENT, ssm:/${self:custom.stage}/launchdarkly/client, ssm:/default/launchdarkly/client}
ui_s3_bucket_name: ${param:S3BucketName}
ui_cloudfront_distribution_id: ${param:CloudFrontDistributionId}
Expand All @@ -61,18 +61,18 @@ custom:
package:initialize: |
set -e
SKIP_PREFLIGHT_CHECK=true yarn run build
# export API_REGION=${self:custom.api_region}
# export API_URL=${self:custom.api_url}
export API_REGION=${self:custom.api_region}
export API_URL=${self:custom.api_url}
export APPLICATION_ENDPOINT=${self:custom.application_endpoint}
# export COGNITO_REGION=${self:custom.cognito_region}
# export COGNITO_IDENTITY_POOL_ID=${self:custom.cognito_identity_pool_id}
# export COGNITO_USER_POOL_ID=${self:custom.cognito_user_pool_id}
# export COGNITO_USER_POOL_CLIENT_ID=${self:custom.cognito_user_pool_client_id}
# export COGNITO_USER_POOL_CLIENT_DOMAIN=${self:custom.cognito_user_pool_client_domain}
# export COGNITO_IDP_NAME=${self:custom.cognito_idp_name}
# export COGNITO_IDP=${self:custom.cognito_idp}
# export COGNITO_REDIRECT_SIGNIN=${self:custom.application_endpoint_url}
# export COGNITO_REDIRECT_SIGNOUT=${self:custom.application_signout_url}
export COGNITO_REGION=${self:custom.cognito_region}
export COGNITO_IDENTITY_POOL_ID=${self:custom.cognito_identity_pool_id}
export COGNITO_USER_POOL_ID=${self:custom.cognito_user_pool_id}
export COGNITO_USER_POOL_CLIENT_ID=${self:custom.cognito_user_pool_client_id}
export COGNITO_USER_POOL_CLIENT_DOMAIN=${self:custom.cognito_user_pool_client_domain}
export COGNITO_IDP_NAME=${self:custom.cognito_idp_name}
export COGNITO_IDP=${self:custom.cognito_idp}
export COGNITO_REDIRECT_SIGNIN=${self:custom.application_endpoint_url}
export COGNITO_REDIRECT_SIGNOUT=${self:custom.application_signout_url}
export POST_SIGNOUT_REDIRECT=${self:custom.signout_redirect_url}
export REACT_APP_LD_SDK_CLIENT=${self:custom.ldSdkClient}
export S3_ATTACHMENTS_BUCKET_REGION=${self:custom.s3_attachments_bucket_region}
Expand Down

0 comments on commit 90a46dc

Please sign in to comment.