Skip to content
Merged
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
1 change: 1 addition & 0 deletions examples/create-key/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ provider "azurerm" {

terraform {
required_version = ">= 1.9, < 2.0"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down
1 change: 1 addition & 0 deletions examples/create-key/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ provider "azurerm" {

terraform {
required_version = ">= 1.9, < 2.0"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down
1 change: 1 addition & 0 deletions examples/default/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ provider "azurerm" {

terraform {
required_version = ">= 1.9, < 2.0"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down
1 change: 1 addition & 0 deletions examples/default/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ provider "azurerm" {

terraform {
required_version = ">= 1.9, < 2.0"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down
3 changes: 2 additions & 1 deletion examples/private-endpoint/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ We have also included the Key Vault firewall to restrict access to the Key Vault
```hcl
terraform {
required_version = ">= 1.9, < 2.0"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down Expand Up @@ -52,10 +53,10 @@ resource "azurerm_resource_group" "this" {

# A vnet is required for the private endpoint.
resource "azurerm_virtual_network" "this" {
address_space = ["192.168.0.0/24"]
location = azurerm_resource_group.this.location
name = module.naming.virtual_network.name_unique
resource_group_name = azurerm_resource_group.this.name
address_space = ["192.168.0.0/24"]
}

resource "azurerm_subnet" "this" {
Expand Down
3 changes: 2 additions & 1 deletion examples/private-endpoint/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
terraform {
required_version = ">= 1.9, < 2.0"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down Expand Up @@ -45,10 +46,10 @@ resource "azurerm_resource_group" "this" {

# A vnet is required for the private endpoint.
resource "azurerm_virtual_network" "this" {
address_space = ["192.168.0.0/24"]
location = azurerm_resource_group.this.location
name = module.naming.virtual_network.name_unique
resource_group_name = azurerm_resource_group.this.name
address_space = ["192.168.0.0/24"]
}

resource "azurerm_subnet" "this" {
Expand Down
8 changes: 0 additions & 8 deletions main.telemetry.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,12 @@ resource "modtm_telemetry" "telemetry" {
module_version = one(data.modtm_module_source.telemetry).module_version
random_id = one(random_uuid.telemetry).result
}, { location = local.main_location })


}
locals {
main_location = var.location
}

data "azapi_client_config" "telemetry" {

count = var.enable_telemetry ? 1 : 0
}

Expand All @@ -41,8 +38,6 @@ locals {
avm_module_source = one(data.modtm_module_source.telemetry).module_source
avm_module_version = one(data.modtm_module_source.telemetry).module_version
})


}

locals {
Expand All @@ -56,12 +51,9 @@ locals {
"git::https://github\\.com/[A|a]zure/.+",
"git::ssh:://git@github\\.com/[A|a]zure/.+",
]


}

locals {
# tflint-ignore: terraform_unused_declarations
avm_azapi_header = join(" ", [for k, v in local.avm_azapi_headers : "${k}=${v}"])

}
9 changes: 5 additions & 4 deletions terraform.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
terraform {
required_version = ">= 1.9, < 2.0"

required_providers {
azapi = {
source = "Azure/azapi"
version = "~> 2.4"
}
azurerm = {
source = "hashicorp/azurerm"
version = ">= 3.117, < 5.0"
Expand All @@ -17,9 +22,5 @@ terraform {
source = "hashicorp/time"
version = "~> 0.9"
}
azapi = {
source = "Azure/azapi"
version = "~> 2.4"
}
}
}
Loading