Skip to content
This repository was archived by the owner on Aug 6, 2025. It is now read-only.

Commit 0480b71

Browse files
authored
DOP-4359: add LanguagesBucket for s3 (#1016)
* add LanguagesBucket for s3 * add docs-languages bucket to cdk-infra list
1 parent f75b3fc commit 0480b71

File tree

3 files changed

+45
-3
lines changed

3 files changed

+45
-3
lines changed

cdk-infra/utils/buckets.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export const docsBucketNames = [
1515
'docs-go',
1616
'docs-java',
1717
'docs-node',
18+
'docs-languages',
1819
] as const;
1920

2021
interface CustomBucketProps {

infrastructure/ecs-main/buckets.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,19 @@ Resources:
174174
IndexDocument: index.html
175175
ErrorDocument: ${self:custom.site.errorDoc.${self:provider.stage}, null}
176176

177+
LanguagesBucket:
178+
Type: "AWS::S3::Bucket"
179+
Properties:
180+
PublicAccessBlockConfiguration:
181+
BlockPublicAcls: false
182+
BlockPublicPolicy: false
183+
IgnorePublicAcls: false
184+
RestrictPublicBuckets: false
185+
BucketName: ${self:custom.languagesBucketName}
186+
WebsiteConfiguration:
187+
IndexDocument: index.html
188+
ErrorDocument: ${self:custom.site.errorDoc.${self:provider.stage}, null}
189+
177190
DocsBucketPolicy:
178191
Type: AWS::S3::BucketPolicy
179192
Properties:
@@ -415,3 +428,33 @@ Resources:
415428
Action: 's3:PutObject'
416429
Resource:
417430
- Fn::Join: ['', [{ "Fn::GetAtt": ["CSharpBucket", "Arn" ] }, '/*']]
431+
432+
LanguagesBucketPolicy:
433+
Type: AWS::S3::BucketPolicy
434+
Properties:
435+
Bucket:
436+
Ref: LanguagesBucket
437+
PolicyDocument:
438+
Statement:
439+
- Sid: PublicReadGetObject
440+
Effect: Allow
441+
Principal: "*"
442+
Action:
443+
- s3:GetObject
444+
Resource:
445+
- Fn::Join: ['', [{ "Fn::GetAtt": ["LanguagesBucket", "Arn" ] }, '/*']]
446+
- Effect: Allow
447+
Principal:
448+
AWS: arn:aws:iam::${aws:accountId}:role/docs-archive-job-${self:provider.stage}-batch
449+
Action:
450+
- 's3:GetObject'
451+
- 's3:ListBucket'
452+
Resource:
453+
- Fn::Join: ['', [{ "Fn::GetAtt": ["LanguagesBucket", "Arn" ] }, '/*']]
454+
- Fn::Join: ['', [{ "Fn::GetAtt": ["LanguagesBucket", "Arn" ] }]]
455+
- Effect: Allow
456+
Principal:
457+
AWS: arn:aws:iam::${aws:accountId}:role/docs-deploy-job-${self:provider.stage}-batch
458+
Action: 's3:PutObject'
459+
Resource:
460+
- Fn::Join: ['', [{ "Fn::GetAtt": ["LanguagesBucket", "Arn" ] }, '/*']]

infrastructure/ecs-main/serverless.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ custom:
121121
cSharpBucketName: docs-csharp-${self:provider.stage}
122122
cSharpIntgrBucketName: docs-csharp-dev
123123
goBucketName: docs-go-${self:provider.stage}
124-
goIntgrBucketName: docs-go-intgr
125124
javaBucketName: docs-java-${self:provider.stage}
126-
javaIntgrBucketName: docs-java-intgr
127125
nodeBucketName: docs-node-${self:provider.stage}
128-
nodeIntgrBucketName: docs-node-intgr
126+
languagesBucketName: docs-languages-${self:provider.stage}
129127
jobCollection: ${ssm:/env/${self:provider.stage}/docs/worker_pool/atlas/collections/job/queue}
130128
repoBranchesCollection: ${ssm:/env/${self:provider.stage}/docs/worker_pool/atlas/collections/repo}
131129
docsetsCollection: ${ssm:/env/${self:provider.stage}/docs/worker_pool/atlas/collections/docsets}

0 commit comments

Comments
 (0)