Revised example resources

NHSDigital · Sep 9, 2024 · 52e39f3 · 52e39f3
1 parent b491cc4
commit 52e39f3
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci-pipeline.yaml b/.github/workflows/ci-pipeline.yaml
@@ -61,7 +61,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y python3-pip && pip3 install checkov
 
       - name: Run Checkov Scan
-        run: checkov --directory infrastructure --skip-path example_resource --skip-path example.tf
+        run: checkov --directory infrastructure --skip-path example --list
 
       - name: Install GitLeaks
         run: |

diff --git a/README.md b/README.md
@@ -169,7 +169,9 @@ Take the following steps to configure and verify the infrastructure:
    terraform apply -auto-approve
    ```
 
-   Now review the deployed infrastructure in the Azure portal. You will find a dummy scenario consisting of some storage accounts and a managed disk, with a backup vault, backup policies and some sample backup instances.
+   Now review the deployed infrastructure in the Azure portal. You will find a backup vault and some sample backup policies.
+
+   The repo contains an `example` module which can be utilised to further extend the sample infrastructure with some resources and backup instances. To use this module for dev/test purposes, include the module in `main.tf` and run `terraform apply` again.
 
 ## Usage
 

diff --git a/infrastructure/example.tf → infrastructure/modules/example/main.tf b/infrastructure/example.tf → infrastructure/modules/example/main.tf
@@ -2,21 +2,21 @@
 ###########################################################################
 
 module "example_storage_account_1" {
-  source               = "./modules/example_resource/storage_account"
+  source               = "./modules/example/storage_account"
   location             = var.vault_location
   storage_account_name = "samystorage001"
   resource_group       = azurerm_resource_group.resource_group.name
 }
 
 module "example_storage_account_2" {
-  source               = "./modules/example_resource/storage_account"
+  source               = "./modules/example/storage_account"
   location             = var.vault_location
   storage_account_name = "samystorage002"
   resource_group       = azurerm_resource_group.resource_group.name
 }
 
 module "example_managed_disk" {
-  source         = "./modules/example_resource/managed_disk"
+  source         = "./modules/example/managed_disk"
   location       = var.vault_location
   disk_name      = "disk-mydisk"
   resource_group = azurerm_resource_group.resource_group.name

diff --git a/...les/example_resource/managed_disk/main.tf → ...ture/modules/example/managed_disk/main.tf b/...les/example_resource/managed_disk/main.tf → ...ture/modules/example/managed_disk/main.tf
diff --git a/...s/example_resource/managed_disk/output.tf → ...re/modules/example/managed_disk/output.tf b/...s/example_resource/managed_disk/output.tf → ...re/modules/example/managed_disk/output.tf
diff --git a/...xample_resource/managed_disk/variables.tf → ...modules/example/managed_disk/variables.tf b/...xample_resource/managed_disk/variables.tf → ...modules/example/managed_disk/variables.tf
diff --git a/.../example_resource/storage_account/main.tf → ...e/modules/example/storage_account/main.tf b/.../example_resource/storage_account/main.tf → ...e/modules/example/storage_account/main.tf
diff --git a/...xample_resource/storage_account/output.tf → ...modules/example/storage_account/output.tf b/...xample_resource/storage_account/output.tf → ...modules/example/storage_account/output.tf
diff --git a/...ple_resource/storage_account/variables.tf → ...ules/example/storage_account/variables.tf b/...ple_resource/storage_account/variables.tf → ...ules/example/storage_account/variables.tf