@@ -21,45 +21,16 @@ resource "aws_s3_bucket_versioning" "storage" {
21
21
}
22
22
}
23
23
24
- data "aws_iam_policy_document" "s3_policy" {
25
- count = var. create_external_storage ? 1 : 0
26
- statement {
27
- actions = [
28
- " s3:PutObject" ,
29
- " s3:ListMultipartUploadParts" ,
30
- " s3:GetObject" ,
31
- " s3:DeleteObject" ,
32
- " s3:AbortMultipartUpload"
33
- ]
34
- resources = [" ${ aws_s3_bucket . gitpod-storage [count . index ]. arn } /*" ]
35
- effect = " Allow"
36
- }
37
- statement {
38
- actions = [" s3:ListBucket" ,
39
- " s3:GetBucketLocation" ,
40
- " s3:ListBucketMultipartUploads" ]
41
- resources = [aws_s3_bucket . gitpod-storage [count . index ]. arn ]
42
- effect = " Allow"
43
- }
44
- }
45
-
46
- resource "aws_iam_policy" "policy" {
47
- count = var. create_external_storage ? 1 : 0
48
- name = " policy-${ var . cluster_name } "
49
- description = " Gitpod ${ var . cluster_name } object storage bucket policy"
50
- policy = data. aws_iam_policy_document . s3_policy [0 ]. json
51
- }
52
-
53
24
resource "aws_iam_user" "bucket_storage" {
54
25
count = var. create_external_storage ? 1 : 0
55
26
name = " user-${ var . cluster_name } "
56
27
57
28
}
58
29
59
- resource "aws_iam_user_policy_attachment" "attachment " {
30
+ resource "aws_iam_user_policy_attachment" "full_access_attachment " {
60
31
count = var. create_external_storage ? 1 : 0
61
32
user = aws_iam_user. bucket_storage [0 ]. name
62
- policy_arn = aws_iam_policy . policy [ 0 ] . arn
33
+ policy_arn = " arn:aws:iam::aws:policy/AmazonS3FullAccess "
63
34
}
64
35
65
36
resource "aws_iam_access_key" "bucket_storage_user" {
@@ -92,35 +63,6 @@ resource "aws_s3_bucket_versioning" "registry" {
92
63
}
93
64
}
94
65
95
- data "aws_iam_policy_document" "s3_policy_registry" {
96
- count = var. create_external_storage_for_registry_backend ? 1 : 0
97
- statement {
98
- actions = [
99
- " s3:PutObject" ,
100
- " s3:ListMultipartUploadParts" ,
101
- " s3:GetObject" ,
102
- " s3:DeleteObject" ,
103
- " s3:AbortMultipartUpload"
104
- ]
105
- resources = [" ${ aws_s3_bucket . gitpod-registry-backend [count . index ]. arn } /*" ]
106
- effect = " Allow"
107
- }
108
- statement {
109
- actions = [" s3:ListBucket" ,
110
- " s3:GetBucketLocation" ,
111
- " s3:ListBucketMultipartUploads" ]
112
- resources = [aws_s3_bucket . gitpod-registry-backend [count . index ]. arn ]
113
- effect = " Allow"
114
- }
115
- }
116
-
117
- resource "aws_iam_policy" "policy_registry" {
118
- count = var. create_external_storage_for_registry_backend ? 1 : 0
119
- name = " registry-policy-${ var . cluster_name } "
120
- description = " Gitpod ${ var . cluster_name } registry backend storage bucket policy"
121
- policy = data. aws_iam_policy_document . s3_policy_registry [count . index ]. json
122
- }
123
-
124
66
resource "aws_iam_user" "bucket_registry" {
125
67
count = var. create_external_storage_for_registry_backend ? 1 : 0
126
68
name = " registry-user-${ var . cluster_name } "
@@ -130,7 +72,7 @@ resource "aws_iam_user" "bucket_registry" {
130
72
resource "aws_iam_user_policy_attachment" "registry_attachment" {
131
73
count = var. create_external_storage_for_registry_backend ? 1 : 0
132
74
user = aws_iam_user. bucket_registry [count . index ]. name
133
- policy_arn = aws_iam_policy . policy_registry [ count . index ] . arn
75
+ policy_arn = " arn:aws:iam::aws:policy/AmazonS3FullAccess "
134
76
}
135
77
136
78
resource "aws_iam_access_key" "bucket_registry_user" {
0 commit comments