Skip to content

Commit 17010c0

Browse files
committed
Revert admin role change as this prevents auto-ops from managing KMS keys via TF.
1 parent 28b1b97 commit 17010c0

File tree

4 files changed

+25
-22
lines changed

4 files changed

+25
-22
lines changed

infra/environments/dev/variables.tfvars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ admin_role = "root" # We shouldn't be using the root account. Ther
44
dev_ops_role = "role/DevOps"
55
dspp_admin_role = "root"
66
environment = "dev"
7-
blue_green_split = false
7+
blue_green_split = false
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
imms_account_id = "084828561157"
22
dspp_account_id = "603871901111"
3-
admin_role = "role/aws-reserved/sso.amazonaws.com/eu-west-2/AWSReservedSSO_PREPROD-IMMS-Admin_acce656dcacf6f4c"
3+
# admin_role = "role/aws-reserved/sso.amazonaws.com/eu-west-2/AWSReservedSSO_PREPROD-IMMS-Admin_acce656dcacf6f4c"
4+
admin_role = "root"
45
dev_ops_role = "role/aws-reserved/sso.amazonaws.com/eu-west-2/AWSReservedSSO_PREPROD-IMMS-Devops_1d28e4f37b940bcd"
56
dspp_admin_role = "root"
67
environment = "preprod"
7-
blue_green_split = true
8+
blue_green_split = true
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
imms_account_id = "664418956997"
22
dspp_account_id = "232116723729"
3-
admin_role = "role/aws-reserved/sso.amazonaws.com/eu-west-2/AWSReservedSSO_PROD-IMMS-Admin_edd6691e4b74064e"
3+
# admin_role = "role/aws-reserved/sso.amazonaws.com/eu-west-2/AWSReservedSSO_PROD-IMMS-Admin_edd6691e4b74064e"
4+
admin_role = "root"
45
dev_ops_role = "role/aws-reserved/sso.amazonaws.com/eu-west-2/AWSReservedSSO_PROD-IMMS-Devops_8f32c62195d56b76"
56
dspp_admin_role = "root"
67
environment = "prod"
7-
blue_green_split = true
8+
blue_green_split = true

infra/variables.tf

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
11
variable "aws_region" {
2-
type = string
2+
type = string
33
default = "eu-west-2"
44
}
55
variable "imms_account_id" {
6-
description = "Immunisation AWS account ID"
7-
type = string
6+
description = "Immunisation AWS account ID"
7+
type = string
88
}
99
variable "dspp_account_id" {
10-
description = "DSPP Core AWS account ID"
11-
type = string
10+
description = "DSPP Core AWS account ID"
11+
type = string
1212
}
1313
variable "auto_ops_role" {
14-
default = "role/auto-ops"
15-
type = string
14+
default = "role/auto-ops"
15+
type = string
1616
}
1717
variable "admin_role" {
18-
type = string
18+
default = "root"
19+
type = string
1920
}
2021
variable "dev_ops_role" {
21-
type = string
22+
type = string
2223
}
2324
variable "dspp_admin_role" {
24-
type = string
25+
type = string
2526
}
2627
variable "build_agent_account_id" {
27-
type = string
28+
type = string
2829
default = "958002497996"
2930
}
3031
variable "environment" {
31-
type = string
32-
description = "Immunisation AWS account name (dev / preprod / prod)"
33-
default = "dev"
32+
type = string
33+
description = "Immunisation AWS account name (dev / preprod / prod)"
34+
default = "dev"
3435
}
3536
variable "blue_green_split" {
36-
type = bool
37-
description = "Whether this account uses blue / green split deployments"
38-
default = false
37+
type = bool
38+
description = "Whether this account uses blue / green split deployments"
39+
default = false
3940
}

0 commit comments

Comments
 (0)