wip

NHSDigital · Sep 9, 2024 · 1b0c542 · 1b0c542
1 parent 62c957e
commit 1b0c542
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 66 deletions.
diff --git a/.github/workflows/ci-pipeline.yaml b/.github/workflows/ci-pipeline.yaml
@@ -61,7 +61,6 @@ jobs:
         uses: bridgecrewio/checkov-action@v12
         with:
           directory: infrastructure
-          args: --skip-path /modules/dummy_resource/storage_account/main.tf
 
       - name: GitLeaks Secret Scan
         uses: zricethezav/[email protected]

diff --git a/infrastructure/main.tf b/infrastructure/main.tf
@@ -37,26 +37,26 @@ resource "azurerm_data_protection_backup_vault" "backup_vault" {
 # Create some dummy resources
 ###########################################################################
 
-module "dummy_storage_account_1" {
-  source               = "./modules/dummy_resource/storage_account"
-  location             = var.vault_location
-  storage_account_name = "samystorage001"
-  resource_group       = azurerm_resource_group.resource_group.name
-}
-
-module "dummy_storage_account_2" {
-  source               = "./modules/dummy_resource/storage_account"
-  location             = var.vault_location
-  storage_account_name = "samystorage002"
-  resource_group       = azurerm_resource_group.resource_group.name
-}
-
-module "dummy_managed_disk" {
-  source         = "./modules/dummy_resource/managed_disk"
-  location       = var.vault_location
-  disk_name      = "disk-mydisk"
-  resource_group = azurerm_resource_group.resource_group.name
-}
+# module "dummy_storage_account_1" {
+#   source               = "./modules/dummy_resource/storage_account"
+#   location             = var.vault_location
+#   storage_account_name = "samystorage001"
+#   resource_group       = azurerm_resource_group.resource_group.name
+# }
+
+# module "dummy_storage_account_2" {
+#   source               = "./modules/dummy_resource/storage_account"
+#   location             = var.vault_location
+#   storage_account_name = "samystorage002"
+#   resource_group       = azurerm_resource_group.resource_group.name
+# }
+
+# module "dummy_managed_disk" {
+#   source         = "./modules/dummy_resource/managed_disk"
+#   location       = var.vault_location
+#   disk_name      = "disk-mydisk"
+#   resource_group = azurerm_resource_group.resource_group.name
+# }
 
 
 # Create some backup policies
@@ -83,48 +83,48 @@ module "managed_disk_policy" {
 # Create some backup instances
 ###########################################################################
 
-module "blob_storage_instance_1" {
-  source             = "./modules/backup_instance/blob_storage"
-  instance_name      = "bkinst-${var.vault_name}-mystorage001"
-  vault_id           = azurerm_data_protection_backup_vault.backup_vault.id
-  vault_location     = var.vault_location
-  vault_principal_id = azurerm_data_protection_backup_vault.backup_vault.identity[0].principal_id
-  policy_id          = module.blob_storage_policy.id
-  storage_account_id = module.dummy_storage_account_1.id
-
-  depends_on = [
-    module.blob_storage_policy,
-    module.dummy_storage_account_1
-  ]
-}
-
-module "blob_storage_instance_2" {
-  source             = "./modules/backup_instance/blob_storage"
-  instance_name      = "bkinst-${var.vault_name}-mystorage002"
-  vault_id           = azurerm_data_protection_backup_vault.backup_vault.id
-  vault_location     = var.vault_location
-  vault_principal_id = azurerm_data_protection_backup_vault.backup_vault.identity[0].principal_id
-  policy_id          = module.blob_storage_policy.id
-  storage_account_id = module.dummy_storage_account_2.id
-
-  depends_on = [
-    module.blob_storage_policy,
-    module.dummy_storage_account_2
-  ]
-}
-
-module "managed_disk_instance" {
-  source                      = "./modules/backup_instance/managed_disk"
-  instance_name               = "bkinst-${var.vault_name}-mydisk"
-  vault_id                    = azurerm_data_protection_backup_vault.backup_vault.id
-  vault_location              = var.vault_location
-  vault_principal_id          = azurerm_data_protection_backup_vault.backup_vault.identity[0].principal_id
-  policy_id                   = module.managed_disk_policy.id
-  managed_disk_id             = module.dummy_managed_disk.id
-  managed_disk_resource_group = azurerm_resource_group.resource_group
-
-  depends_on = [
-    module.managed_disk_policy,
-    module.dummy_managed_disk
-  ]
-}
+# module "blob_storage_instance_1" {
+#   source             = "./modules/backup_instance/blob_storage"
+#   instance_name      = "bkinst-${var.vault_name}-mystorage001"
+#   vault_id           = azurerm_data_protection_backup_vault.backup_vault.id
+#   vault_location     = var.vault_location
+#   vault_principal_id = azurerm_data_protection_backup_vault.backup_vault.identity[0].principal_id
+#   policy_id          = module.blob_storage_policy.id
+#   storage_account_id = module.dummy_storage_account_1.id
+
+#   depends_on = [
+#     module.blob_storage_policy,
+#     module.dummy_storage_account_1
+#   ]
+# }
+
+# module "blob_storage_instance_2" {
+#   source             = "./modules/backup_instance/blob_storage"
+#   instance_name      = "bkinst-${var.vault_name}-mystorage002"
+#   vault_id           = azurerm_data_protection_backup_vault.backup_vault.id
+#   vault_location     = var.vault_location
+#   vault_principal_id = azurerm_data_protection_backup_vault.backup_vault.identity[0].principal_id
+#   policy_id          = module.blob_storage_policy.id
+#   storage_account_id = module.dummy_storage_account_2.id
+
+#   depends_on = [
+#     module.blob_storage_policy,
+#     module.dummy_storage_account_2
+#   ]
+# }
+
+# module "managed_disk_instance" {
+#   source                      = "./modules/backup_instance/managed_disk"
+#   instance_name               = "bkinst-${var.vault_name}-mydisk"
+#   vault_id                    = azurerm_data_protection_backup_vault.backup_vault.id
+#   vault_location              = var.vault_location
+#   vault_principal_id          = azurerm_data_protection_backup_vault.backup_vault.identity[0].principal_id
+#   policy_id                   = module.managed_disk_policy.id
+#   managed_disk_id             = module.dummy_managed_disk.id
+#   managed_disk_resource_group = azurerm_resource_group.resource_group
+
+#   depends_on = [
+#     module.managed_disk_policy,
+#     module.dummy_managed_disk
+#   ]
+# }