Skip to content

Commit 8581fcc

Browse files
Merge pull request #1103 from NHSDigital/feature/made14-NRL-1832-rm-nhsidentities-perms
NRL-1832 Remove resources and references to NHSD Identities accounts
2 parents 9afcb5e + a169266 commit 8581fcc

File tree

13 files changed

+0
-294
lines changed

13 files changed

+0
-294
lines changed

terraform/account-wide-infrastructure/dev/data.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ data "aws_region" "current" {}
22

33
data "aws_caller_identity" "current" {}
44

5-
data "aws_secretsmanager_secret_version" "identities_account_id" {
6-
secret_id = aws_secretsmanager_secret.identities_account_id.name
7-
}
8-
95
data "aws_secretsmanager_secret_version" "backup_destination_parameters" {
106
secret_id = aws_secretsmanager_secret.backup_destination_parameters.name
117
}

terraform/account-wide-infrastructure/dev/iam__developer-role.tf

Lines changed: 0 additions & 26 deletions
This file was deleted.

terraform/account-wide-infrastructure/dev/secrets.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
resource "aws_secretsmanager_secret" "identities_account_id" {
2-
name = "${local.prefix}--nhs-identities-account-id"
3-
}
4-
51
resource "aws_secretsmanager_secret" "backup_destination_parameters" {
62
name = "${local.prefix}--backup-destination-parameters"
73
description = "Parameters used to configure the backup destination"

terraform/account-wide-infrastructure/mgmt/data.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ data "aws_s3_bucket" "truststore" {
1818
bucket = "${local.project}--truststore"
1919
}
2020

21-
data "aws_secretsmanager_secret_version" "identities_account_id" {
22-
secret_id = aws_secretsmanager_secret.identities_account_id.name
23-
}
24-
2521
data "aws_secretsmanager_secret" "prod_account_id" {
2622
name = "${local.project}--mgmt--prod-account-id"
2723
}

terraform/account-wide-infrastructure/mgmt/iam__developer-role.tf renamed to terraform/account-wide-infrastructure/mgmt/iam.tf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
resource "aws_iam_role" "developer_role" {
2-
name = "NHSDDeveloperRole"
3-
assume_role_policy = jsonencode({
4-
Version : "2012-10-17",
5-
Statement : [
6-
{
7-
Action : "sts:AssumeRole",
8-
Principal : {
9-
AWS : "arn:aws:iam::${data.aws_secretsmanager_secret_version.identities_account_id.secret_string}:root"
10-
},
11-
Effect : "Allow"
12-
}
13-
]
14-
})
15-
}
16-
171
module "developer_policy" {
182
source = "../modules/role-policy"
193
name = "${local.prefix}--developer-policy"

terraform/account-wide-infrastructure/mgmt/secrets.tf

Lines changed: 0 additions & 3 deletions
This file was deleted.

terraform/account-wide-infrastructure/prod/data.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ data "aws_region" "current" {}
22

33
data "aws_caller_identity" "current" {}
44

5-
data "aws_secretsmanager_secret_version" "identities_account_id" {
6-
secret_id = aws_secretsmanager_secret.identities_account_id.name
7-
}
8-
95
data "aws_secretsmanager_secret" "emails" {
106
name = "${local.prefix}-emails"
117
}

terraform/account-wide-infrastructure/prod/iam__ops-role.tf

Lines changed: 0 additions & 135 deletions
This file was deleted.

terraform/account-wide-infrastructure/prod/secrets.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
resource "aws_secretsmanager_secret" "identities_account_id" {
2-
name = "${local.prefix}--nhs-identities-account-id"
3-
}
4-
51
resource "aws_secretsmanager_secret" "prod_smoke_test_apigee_app" {
62
name = "${local.prefix}--prod--apigee-app--smoke-test"
73
description = "APIGEE App used to run Smoke Tests against the PROD environment"

terraform/account-wide-infrastructure/test/data.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ data "aws_region" "current" {}
22

33
data "aws_caller_identity" "current" {}
44

5-
data "aws_secretsmanager_secret_version" "identities_account_id" {
6-
secret_id = aws_secretsmanager_secret.identities_account_id.name
7-
}
8-
95
data "aws_secretsmanager_secret" "emails" {
106
name = "${local.prefix}-emails"
117
}

0 commit comments

Comments
 (0)