Skip to content

Commit 12297d7

Browse files
committed
update
1 parent 991869b commit 12297d7

File tree

11 files changed

+450
-394
lines changed

11 files changed

+450
-394
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ local:
8686
postdeploy:
8787
@echo "Syncing S3 UI bucket..."
8888
aws s3 sync $(dist_ui_directory_root) s3://$(ui_s3_bucket)/ --delete
89+
aws s3 sync $(dist_ui_directory_root) s3://$(s3_bucket_prefix)/ --delete
8990
make invalidate_cloudfront
9091

9192
deploy_prod: check_account_prod
@@ -98,12 +99,9 @@ deploy_prod: check_account_prod
9899
make postdeploy
99100

100101
deploy_dev: check_account_dev
101-
@echo "Deploying CloudFormation stack..."
102-
# @sam deploy $(common_params) --parameter-overrides $(run_env)=dev $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)" S3BucketPrefix="$(s3_bucket_prefix)" CloudfrontOriginSecret="$(ORIGIN_SECRET)"
103102
@echo "Deploying Terraform..."
104-
$(eval MAIN_DISTRIBUTION_ID := $(shell aws cloudformation describe-stacks --stack-name $(application_key) --query "Stacks[0].Outputs[?OutputKey=='CloudfrontDistributionId'].OutputValue" --output text))
105103
terraform -chdir=terraform/envs/qa init -lockfile=readonly
106-
terraform -chdir=terraform/envs/qa apply -auto-approve -var main_cloudfront_distribution_id="$(MAIN_DISTRIBUTION_ID)"
104+
terraform -chdir=terraform/envs/qa apply -auto-approve
107105
make postdeploy
108106

109107
invalidate_cloudfront:

cloudformation/iam.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -260,48 +260,7 @@ Resources:
260260
- "*@illinois.edu"
261261
- "*"
262262

263-
264-
EdgeLambdaIAMRole:
265-
Type: AWS::IAM::Role
266-
Properties:
267-
AssumeRolePolicyDocument:
268-
Version: "2012-10-17"
269-
Statement:
270-
- Effect: Allow
271-
Principal:
272-
Service: "lambda.amazonaws.com"
273-
Action: "sts:AssumeRole"
274-
- Effect: Allow
275-
Principal:
276-
Service: "edgelambda.amazonaws.com"
277-
Action: "sts:AssumeRole"
278-
Policies:
279-
- PolicyName: lambda-edge
280-
PolicyDocument:
281-
Version: "2012-10-17"
282-
Statement:
283-
- Effect: Allow
284-
Action:
285-
- "logs:CreateLogGroup"
286-
- "logs:CreateLogStream"
287-
- "logs:PutLogEvents"
288-
Resource:
289-
- Fn::Sub: arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/${LambdaFunctionName}-edge:*
290-
291263
Outputs:
292264
MainFunctionRoleArn:
293265
Description: Main API IAM role ARN
294266
Value: !GetAtt ApiLambdaIAMRole.Arn
295-
296-
SqsFunctionRoleArn:
297-
Description: SQS IAM role ARN
298-
Value: !GetAtt SqsLambdaIAMRole.Arn
299-
300-
EntraFunctionRoleArn:
301-
Description: Entra IAM role ARN
302-
Value: !GetAtt EntraLambdaIAMRole.Arn
303-
304-
EdgeFunctionRoleArn:
305-
Description: Edge IAM role ARN
306-
Value: !GetAtt EdgeLambdaIAMRole.Arn
307-

0 commit comments

Comments
 (0)