Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use normalise_resource_id #25

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Module to provision azure stack hci.

The following requirements are needed by this module:

- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.5)
- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.8)

- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (~> 1.14)

- <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) (~> 2.50.0)

- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 3.71)
- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 4.0)

- <a name="requirement_modtm"></a> [modtm](#requirement\_modtm) (~> 0.3)

Expand Down
8 changes: 4 additions & 4 deletions examples/default/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ This deploys the module in its simplest form.

```hcl
terraform {
required_version = "~> 1.5"
required_version = "~> 1.8"
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.74"
version = "~> 4.0"
}
}
}
Expand Down Expand Up @@ -93,9 +93,9 @@ module "test" {

The following requirements are needed by this module:

- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.5)
- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.8)

- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 3.74)
- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 4.0)

## Resources

Expand Down
4 changes: 2 additions & 2 deletions examples/default/main.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
terraform {
required_version = "~> 1.5"
required_version = "~> 1.8"
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.74"
version = "~> 4.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ locals {
}
}
deployment_setting_properties_omit_null = { for k, v in local.deployment_setting_properties : k => v if v != null }
key_vault = var.create_key_vault ? azurerm_key_vault.deployment_keyvault[0] : data.azurerm_key_vault.key_vault[0]
key_vault = var.create_key_vault ? azurerm_key_vault.deployment_keyvault[0] : provider::azurerm::normalise_resource_id(data.azurerm_key_vault.key_vault[0])
keyvault_secret_names = var.use_legacy_key_vault_model ? {
"AzureStackLCMUserCredential" = "AzureStackLCMUserCredential"
"LocalAdminCredential" = "LocalAdminCredential"
Expand Down
4 changes: 2 additions & 2 deletions terraform.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.5"
required_version = "~> 1.8"
required_providers {
azapi = {
source = "azure/azapi"
Expand All @@ -11,7 +11,7 @@ terraform {
}
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.71"
version = "~> 4.0"
}
modtm = {
source = "azure/modtm"
Expand Down
Loading