Fixing some breaking changes in Azure terraform configs

Signed-off-by: Mark Rossetti <[email protected]>

Author: marosset

infra/azure/terraform/capz/container-registry/main.tf

@@ -29,10 +29,7 @@ resource "azurerm_container_registry" "capzci_registry" {
   sku                    = "Premium"
   anonymous_pull_enabled = true
 
-  retention_policy {
-    days    = 7
-    enabled = true
-  }
+  retention_policy_in_days = 7
 
   tags = {
     RetentionPolicy = "7days"
@@ -87,10 +84,7 @@ resource "azurerm_container_registry" "e2eprivate_registry" {
   resource_group_name = var.resource_group_name
   sku                 = "Premium"
 
-  retention_policy {
-    days    = 7
-    enabled = true
-  }
+  retention_policy_in_days = 7
 
   tags = {
     RetentionPolicy = "7days"

infra/azure/terraform/capz/main.tf

@@ -16,6 +16,7 @@ limitations under the License.
 
 provider "azurerm" {
   features {}
+  subscription_id = var.subscription_id
 }
 
 terraform {
@@ -131,7 +132,9 @@ module "cluster_api_gallery" {
   source              = "./cluster-api-gallery"
   resource_group_name = var.resource_group_name
   location            = var.location
-  depends_on          = module.role_assignments
+  depends_on          = [
+    module.role_assignments
+  ]
 }
 
 # Import CAPZ monitoring module

infra/azure/terraform/capz/variables.tf

@@ -31,3 +31,9 @@ variable "storage_account_name" {
   default     = "k8sprowstoragecomm"
   description = "Name of the storage account."
 }
+
+variable "subscription_id" {
+  type        = string
+  default     = "46678f10-4bbb-447e-98e8-d2829589f2d8"
+  description = "Azure Subscription ID to use for the azurerm provider."
+}