Skip to content

Commit 40cca15

Browse files
committed
DOPS-101 Specify role arn to work with backend
1 parent 63150d0 commit 40cca15

File tree

4 files changed

+14
-34
lines changed

4 files changed

+14
-34
lines changed

terraform/aws.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
provider "aws" {
55
region = "${var.aws_region}"
66
version = "~> 1.57"
7+
assume_role = {
8+
role_arn = "arn:aws:iam::587267277416:role/terraform_sandbox_backend_admin"
9+
}
710
}
811

912
data "aws_caller_identity" "current" {}

terraform/bootstrap/jenkins.tf

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,8 @@ data "aws_iam_policy_document" "terraform_backend_role_policy_document" {
2828
statement {
2929
effect = "Allow"
3030

31-
actions = ["s3:*"]
32-
resources = ["arn:aws:s3:::${module.bootstrap.state_bucket}/*"]
33-
}
34-
35-
statement {
36-
effect = "Allow"
37-
38-
actions = ["dynamodb:*"]
39-
resources = ["arn:aws:dynamodb:${var.aws_region}:${data.aws_caller_identity.current.account_id}:table/${module.bootstrap.dynamodb_table}"]
31+
actions = ["*"]
32+
resources = ["*"]
4033
}
4134
}
4235

terraform/bootstrap/terraform.tfstate

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 4,
33
"terraform_version": "1.2.9",
4-
"serial": 215,
4+
"serial": 217,
55
"lineage": "3466ed5e-b3d1-107e-19aa-0306c957a966",
66
"outputs": {
77
"account_id": {
@@ -104,8 +104,8 @@
104104
{
105105
"schema_version": 0,
106106
"attributes": {
107-
"id": "1540866772",
108-
"json": "{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Sid\": \"\",\n \"Effect\": \"Allow\",\n \"Action\": \"s3:*\",\n \"Resource\": \"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1/*\"\n },\n {\n \"Sid\": \"\",\n \"Effect\": \"Allow\",\n \"Action\": \"dynamodb:*\",\n \"Resource\": \"arn:aws:dynamodb:us-east-1:587267277416:table/moduscreate-devops-demo-state-lock\"\n }\n ]\n}",
107+
"id": "784443208",
108+
"json": "{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Sid\": \"\",\n \"Effect\": \"Allow\",\n \"Action\": \"*\",\n \"Resource\": \"*\"\n }\n ]\n}",
109109
"override_json": null,
110110
"override_policy_documents": null,
111111
"policy_id": null,
@@ -114,22 +114,7 @@
114114
"statement": [
115115
{
116116
"actions": [
117-
"s3:*"
118-
],
119-
"condition": [],
120-
"effect": "Allow",
121-
"not_actions": [],
122-
"not_principals": [],
123-
"not_resources": [],
124-
"principals": [],
125-
"resources": [
126-
"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1/*"
127-
],
128-
"sid": ""
129-
},
130-
{
131-
"actions": [
132-
"dynamodb:*"
117+
"*"
133118
],
134119
"condition": [],
135120
"effect": "Allow",
@@ -138,7 +123,7 @@
138123
"not_resources": [],
139124
"principals": [],
140125
"resources": [
141-
"arn:aws:dynamodb:us-east-1:587267277416:table/moduscreate-devops-demo-state-lock"
126+
"*"
142127
],
143128
"sid": ""
144129
}
@@ -164,7 +149,7 @@
164149
"name": "terraform-backend-role-policy",
165150
"name_prefix": null,
166151
"path": "/",
167-
"policy": "{\"Statement\":[{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Resource\":\"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1/*\",\"Sid\":\"\"},{\"Action\":\"dynamodb:*\",\"Effect\":\"Allow\",\"Resource\":\"arn:aws:dynamodb:us-east-1:587267277416:table/moduscreate-devops-demo-state-lock\",\"Sid\":\"\"}],\"Version\":\"2012-10-17\"}",
152+
"policy": "{\"Statement\":[{\"Action\":\"*\",\"Effect\":\"Allow\",\"Resource\":\"*\",\"Sid\":\"\"}],\"Version\":\"2012-10-17\"}",
168153
"policy_id": "ANPAYRO63QJUEYGCFJVOK",
169154
"tags": {},
170155
"tags_all": {}
@@ -231,10 +216,8 @@
231216
"dependencies": [
232217
"aws_iam_policy.terraform_backend_role_policy",
233218
"aws_iam_role.terraform_backend_role",
234-
"data.aws_caller_identity.current",
235219
"data.aws_iam_policy_document.terraform_backend_account_policy",
236-
"data.aws_iam_policy_document.terraform_backend_role_policy_document",
237-
"module.bootstrap.aws_dynamodb_table.terraform_state_lock"
220+
"data.aws_iam_policy_document.terraform_backend_role_policy_document"
238221
]
239222
}
240223
]
@@ -563,7 +546,7 @@
563546
],
564547
"object_lock_configuration": [],
565548
"object_lock_enabled": false,
566-
"policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"enforce-tls-requests-only\",\"Effect\":\"Deny\",\"Principal\":{\"AWS\":\"*\"},\"Action\":\"s3:*\",\"Resource\":\"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1/*\",\"Condition\":{\"Bool\":{\"aws:SecureTransport\":\"false\"}}},{\"Sid\":\"inventory-and-analytics\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"s3:PutObject\",\"Resource\":\"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1/*\",\"Condition\":{\"StringEquals\":{\"s3:x-amz-acl\":\"bucket-owner-full-control\",\"aws:SourceAccount\":\"587267277416\"},\"ArnLike\":{\"aws:SourceArn\":\"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1\"}}}]}",
549+
"policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"enforce-tls-requests-only\",\"Effect\":\"Deny\",\"Principal\":{\"AWS\":\"*\"},\"Action\":\"s3:*\",\"Resource\":\"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1/*\",\"Condition\":{\"Bool\":{\"aws:SecureTransport\":\"false\"}}},{\"Sid\":\"inventory-and-analytics\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"s3:PutObject\",\"Resource\":\"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1/*\",\"Condition\":{\"StringEquals\":{\"aws:SourceAccount\":\"587267277416\",\"s3:x-amz-acl\":\"bucket-owner-full-control\"},\"ArnLike\":{\"aws:SourceArn\":\"arn:aws:s3:::moduscreate-devops-demo-tf-state-us-east-1\"}}}]}",
567550
"region": "us-east-1",
568551
"replication_configuration": [],
569552
"request_payer": "BucketOwner",

terraform/terraform.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ terraform {
99
dynamodb_table = "moduscreate-devops-demo-state-lock"
1010
region = "us-east-1"
1111
encrypt = "true"
12+
role_arn = "arn:aws:iam::587267277416:role/terraform_sandbox_backend_admin"
1213
}
1314
}
1415

0 commit comments

Comments
 (0)