Skip to content

Commit

Permalink
Add ability to skip provider registrations for the terraform azure pr…
Browse files Browse the repository at this point in the history
…ovider. (#408)
  • Loading branch information
lagosr-google authored Oct 28, 2024
1 parent 65ff73b commit 46fa72e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 2 additions & 0 deletions cloud/azure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ terraform {

provider "azurerm" {
features {}

skip_provider_registration = var.azure_skip_provider_registration
}
3 changes: 2 additions & 1 deletion cloud/azure/templates/azure_saml_ses/providers.tf
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions cloud/azure/templates/azure_saml_ses/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 46fa72e

Please sign in to comment.