Fix YAML formatting in CF template

pull/14/head
Gunnar Aasen 2019-01-18 23:23:20 -08:00
parent d896905723
commit ca41c940d4
1 changed files with 28 additions and 29 deletions

View File

@ -49,7 +49,7 @@ Resources:
DocsCloudFrontDistribution: DocsCloudFrontDistribution:
Type: AWS::CloudFront::Distribution Type: AWS::CloudFront::Distribution
Description: The Description: The CDN for both V1 and V2 docs.
Properties: Properties:
DistributionConfig: DistributionConfig:
Aliases: Aliases:
@ -118,9 +118,9 @@ Resources:
PolicyDocument: PolicyDocument:
Statement: Statement:
- -
Effect: Allow
Action: Action:
- s3:GetObject - s3:GetObject
Effect: Allow
Resource: !Sub "arn:aws:s3:::${DocsV2Bucket}/*" Resource: !Sub "arn:aws:s3:::${DocsV2Bucket}/*"
Principal: Principal:
CanonicalUser: !GetAtt DocsCloudFrontOriginAccessIdentity.S3CanonicalUserId CanonicalUser: !GetAtt DocsCloudFrontOriginAccessIdentity.S3CanonicalUserId
@ -143,10 +143,9 @@ Resources:
Bucket: !Ref DocsV1Bucket Bucket: !Ref DocsV1Bucket
PolicyDocument: PolicyDocument:
Statement: Statement:
- - Effect: Allow
Action: Action:
- s3:GetObject - s3:GetObject
Effect: Allow
Resource: !Sub "arn:aws:s3:::${DocsV1Bucket}/*" Resource: !Sub "arn:aws:s3:::${DocsV1Bucket}/*"
Principal: Principal:
CanonicalUser: !GetAtt DocsCloudFrontOriginAccessIdentity.S3CanonicalUserId CanonicalUser: !GetAtt DocsCloudFrontOriginAccessIdentity.S3CanonicalUserId
@ -227,12 +226,11 @@ Resources:
Version: 2012-10-17 Version: 2012-10-17
Statement: Statement:
- Effect: Allow - Effect: Allow
Action: sts:AssumeRole
Principal: Principal:
Service: Service:
- edgelambda.amazonaws.com - edgelambda.amazonaws.com
- lambda.amazonaws.com - lambda.amazonaws.com
Action:
- sts:AssumeRole
ManagedPolicyArns: ManagedPolicyArns:
- arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
@ -240,29 +238,30 @@ Resources:
Type: AWS::IAM::User Type: AWS::IAM::User
Properties: Properties:
Policies: Policies:
PolicyDocument: - PolicyName: giveaccesstoupdatedocsbuckets
Version: 2012-10-17 PolicyDocument:
Statement: Version: 2012-10-17
- Effect: Allow Statement:
Action: - Effect: Allow
- s3:ListBucket Action:
- s3:GetBucketLocation - s3:ListBucket
Resource: - s3:GetBucketLocation
- !Sub "arn:aws:s3:::${DocsV2Bucket}" Resource:
- !Sub "arn:aws:s3:::${DocsV1Bucket}" - !Sub "arn:aws:s3:::${DocsV2Bucket}"
- Effect: Allow - !Sub "arn:aws:s3:::${DocsV1Bucket}"
Action: - Effect: Allow
- s3:PutObject Action:
- s3:PutObjectAcl - s3:PutObject
- s3:DeleteObject - s3:PutObjectAcl
Resource: - s3:DeleteObject
- !Sub "arn:aws:s3:::${DocsV2Bucket}/*" Resource:
- !Sub "arn:aws:s3:::${DocsV1Bucket}/*" - !Sub "arn:aws:s3:::${DocsV2Bucket}/*"
- Effect: Allow - !Sub "arn:aws:s3:::${DocsV1Bucket}/*"
Action: - Effect: Allow
- cloudfront:GetDistribution Action:
- cloudfront:CreateInvalidation - cloudfront:GetDistribution
Resource: !Sub "arn:aws:cloudfront::${AWS::AccountId}:distribution/${DocsCloudFrontDistribution}" - cloudfront:CreateInvalidation
Resource: !Sub "arn:aws:cloudfront::${AWS::AccountId}:distribution/${DocsCloudFrontDistribution}"
DocsCircleCIDeployAccessKey: DocsCircleCIDeployAccessKey:
Type: AWS::IAM::AccessKey Type: AWS::IAM::AccessKey