diff --git a/cloud/azure/main.tf b/cloud/azure/main.tf index ee336e98..974a8772 100644 --- a/cloud/azure/main.tf +++ b/cloud/azure/main.tf @@ -13,4 +13,6 @@ terraform { provider "azurerm" { features {} + + skip_provider_registration = var.azure_skip_provider_registration } diff --git a/cloud/azure/templates/azure_saml_ses/providers.tf b/cloud/azure/templates/azure_saml_ses/providers.tf index 012fec7e..38a8e0b0 100644 --- a/cloud/azure/templates/azure_saml_ses/providers.tf +++ b/cloud/azure/templates/azure_saml_ses/providers.tf @@ -1,5 +1,6 @@ provider "azurerm" { features {} # https://github.com/civiform/civiform/issues/8598 - subscription_id = "4ef4ae1b-c966-4ac4-9b7c-a837ea410821" + subscription_id = "4ef4ae1b-c966-4ac4-9b7c-a837ea410821" + skip_provider_registration = var.azure_skip_provider_registration } \ No newline at end of file diff --git a/cloud/azure/templates/azure_saml_ses/variable_definitions.json b/cloud/azure/templates/azure_saml_ses/variable_definitions.json index ce5ac329..edbd786f 100644 --- a/cloud/azure/templates/azure_saml_ses/variable_definitions.json +++ b/cloud/azure/templates/azure_saml_ses/variable_definitions.json @@ -112,6 +112,12 @@ "tfvar": false, "type": "string" }, + "AZURE_SKIP_PROVIDER_REGISTRATION": { + "required": false, + "secret": false, + "tfvar": true, + "type": "bool" + }, "KEY_VAULT_NAME": { "required": true, "secret": false, diff --git a/cloud/azure/templates/azure_saml_ses/variables.tf b/cloud/azure/templates/azure_saml_ses/variables.tf index 5a73f734..5d469e2e 100644 --- a/cloud/azure/templates/azure_saml_ses/variables.tf +++ b/cloud/azure/templates/azure_saml_ses/variables.tf @@ -9,6 +9,12 @@ variable "azure_resource_group" { description = "Name of the resource group where key vault is already created." } +variable "azure_skip_provider_registration" { + type = bool + description = "Whether to skip provider registrations on azure, useful when using a principal with limited permissions." + default = false +} + variable "civiform_time_zone_id" { type = string description = "Time zone for Civiform server to use when displaying dates."