Skip to content

Commit 0ead1d3

Browse files
committed
Use modules directly from GitHub
* That is much better than copying the source code into our repository
1 parent e27cb4f commit 0ead1d3

22 files changed

+3
-928
lines changed

hk.pkl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ local linters = new Mapping<String, Group> {
3232

3333
["tf_lint"] = new Step {
3434
glob = "*.tf"
35-
check = "tflint --chdir=terraform/app --config=$(pwd)/terraform/.tflint.hcl --recursive && tflint --chdir=terraform/backup --config=$(pwd)/terraform/.tflint.hcl --recursive && tflint --chdir=terraform/bootstrap --config=$(pwd)/terraform/.tflint.hcl --recursive && tflint --chdir=terraform/modules --config=$(pwd)/terraform/.tflint.hcl --recursive"
35+
check = "tflint --chdir=terraform --config=$(pwd)/terraform/.tflint.hcl --recursive"
3636
fix = "tflint --chdir=terraform --config=$(pwd)/terraform/.tflint.hcl --recursive --fix"
3737
}
3838
}

terraform/backup/destination/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resource "aws_kms_key" "destination_backup_key" {
4848
}
4949

5050
module "destination" {
51-
source = "../../modules-external/aws-backup-destination"
51+
source = "git@github.com:NHSDigital/terraform-aws-backup.git//modules/aws-backup-destination?ref=v1.1.0"
5252
source_account_name = "mavis-${var.source_account_environment}"
5353
account_id = local.destination_account_id
5454
source_account_id = var.source_account_id

terraform/backup/source/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ resource "aws_kms_key" "backup_notifications" {
116116
# Now we can deploy the source and destination modules, referencing the resources we've created above.
117117

118118
module "source" {
119-
source = "../../modules-external/aws-backup-source"
119+
source = "git@github.com:NHSDigital/terraform-aws-backup.git//modules/aws-backup-source?ref=v1.1.0"
120120

121121
backup_copy_vault_account_id = local.destination_account_id
122122
backup_copy_vault_arn = var.destination_vault_arn

terraform/modules-external/aws-backup-destination/README.md

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

terraform/modules-external/aws-backup-destination/backup.tf

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

terraform/modules-external/aws-backup-destination/backup_vault_lock.tf

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

terraform/modules-external/aws-backup-destination/backup_vault_policy.tf

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

terraform/modules-external/aws-backup-destination/variables.tf

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

0 commit comments

Comments
 (0)