feat: new telemetry

.github/workflows/go-test-unit.yml

@@ -56,9 +56,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        azapi_version: ['latest', '1.11.0']
-        azurerm_version: ['latest', '3.7.0']
-        terraform_version: ['latest', '1.4.0']
+        azapi_version: ['latest', '1.14.0']
+        azurerm_version: ['latest', '3.107.0']
+        terraform_version: ['latest', '1.6.0']
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -72,20 +72,7 @@ jobs:
           terraform_version: ${{ matrix.terraform_version }}
           terraform_wrapper: false
 
-      - name: Setup go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: tests/go.mod
-          cache-dependency-path: tests/go.sum
-
-      - name: Set GOMAXPROCS to 2 * number of cores
-        run: |
-          CORES="$(grep -Pc '^processor\t' /proc/cpuinfo)"
-          ((DOUBLE=CORES*2))
-          echo "Setting GOMAXPROCS to $DOUBLE"
-          echo "GOMAXPROCS=$DOUBLE" >> "$GITHUB_ENV"
-
-      - name: Go test
+      - name: Terraform test
         run: make TESTARGS='-v' TESTFILTER='${{ github.event.inputs.test_filter }}' test
         env:
           ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

Makefile

@@ -36,7 +36,8 @@ lint:
 	cd tests && golangci-lint run
 
 test: fmtcheck
-	cd tests && go test $(TEST) $(TESTARGS) -run ^Test$(TESTFILTER) -timeout=$(TESTTIMEOUT)
+	terraform test
+	if [ -d "modules" ]; then	for dir in modules/*; do if [ -d "$$dir" ]; then echo "==> Testing $$dir"; cd $$dir; terraform test; echo; cd - >/dev/null; fi;	done; fi
 
 testdeploy: fmtcheck
 	cd tests &&	TERRATEST_DEPLOY=1 go test $(TEST) $(TESTARGS) -run ^TestDeploy$(TESTFILTER) -timeout $(TESTTIMEOUT)

README.md

@@ -136,9 +136,13 @@ module "lz_vending" {
 
 The following requirements are needed by this module:
 
-- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (>= 1.3.0)
+- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.3)
 
-- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (>= 1.4.0)
+- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (~> 1.4)
+
+- <a name="requirement_modtm"></a> [modtm](#requirement\_modtm) (~> 0.3)
+
+- <a name="requirement_random"></a> [random](#requirement\_random) (~> 3.6)
 
 ## Modules
 
@@ -1021,7 +1025,10 @@ Default: `{}`
 
 The following resources are used by this module:
 
-- [azapi_resource.telemetry_root](https://registry.terraform.io/providers/azure/azapi/latest/docs/resources/resource) (resource)
+- [modtm_telemetry.telemetry](https://registry.terraform.io/providers/azure/modtm/latest/docs/resources/telemetry) (resource)
+- [random_uuid.telemetry](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/uuid) (resource)
+- [azurerm_client_config.telemetry](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) (data source)
+- [modtm_module_source.telemetry](https://registry.terraform.io/providers/azure/modtm/latest/docs/data-sources/module_source) (data source)
 
 ## Outputs
 
@@ -1108,4 +1115,4 @@ Authorized use of Microsoft trademarks or logos is subject to and must follow
 [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/legal/intellectualproperty/trademarks/usage/general).
 Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
 Any use of third-party trademarks or logos are subject to those third-party's policies.
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->

main.telemetry.tf

@@ -1,16 +1,24 @@
-# This is the root module telemetry deployment that is only created if telemetry is enabled.
-# It is deployed to the created or supplied subscription
-resource "azapi_resource" "telemetry_root" {
-  count     = var.disable_telemetry ? 0 : 1
-  parent_id = local.subscription_resource_id
-  name      = local.telem_root_arm_deployment_name
-  type      = "Microsoft.Resources/deployments@2021-04-01"
-  location  = var.location
-  body = jsonencode({
-    properties = {
-      mode     = "Incremental"
-      template = local.telem_arm_subscription_template
-    }
-  })
-  ignore_missing_property = true
+data "azapi_client_config" "telemetry" {
+  count = var.disable_telemetry ? 0 : 1
+}
+
+data "modtm_module_source" "telemetry" {
+  count       = var.disable_telemetry ? 0 : 1
+  module_path = path.module
+}
+
+resource "random_uuid" "telemetry" {
+  count = var.disable_telemetry ? 0 : 1
+}
+
+resource "modtm_telemetry" "telemetry" {
+  count = var.disable_telemetry ? 0 : 1
+
+  tags = {
+    subscription_id = local.subscription_id
+    tenant_id       = one(data.azurerm_client_config.telemetry).tenant_id
+    module_source   = one(data.modtm_module_source.telemetry).module_source
+    module_version  = one(data.modtm_module_source.telemetry).module_version
+    random_id       = one(random_uuid.telemetry).result
+  }
 }

modules/budget/README.md

@@ -34,9 +34,9 @@ module "budget" {
 
 The following requirements are needed by this module:
 
-- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (>= 1.3.0)
+- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.3)
 
-- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (>= 1.11.0)
+- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (~> 1.11)
 
 ## Modules
 

modules/budget/main.tf

@@ -2,7 +2,7 @@ resource "azapi_resource" "budget" {
   type      = "Microsoft.Consumption/budgets@2021-10-01"
   name      = var.budget_name
   parent_id = var.budget_scope
-  body = jsonencode({
+  body = {
     properties = {
       amount        = var.budget_amount
       category      = "Cost"
@@ -13,7 +13,5 @@ resource "azapi_resource" "budget" {
         startDate = var.budget_time_period.start_date
       }
     }
-  })
+  }
 }
-
-

modules/budget/terraform.tf

@@ -1,9 +1,9 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = "~> 1.6"
   required_providers {
     azapi = {
       source  = "azure/azapi"
-      version = ">= 1.11.0"
+      version = "~> 1.14"
     }
   }
 }

modules/resourcegroup/README.md

@@ -33,9 +33,9 @@ module "resourcegroups" {
 
 The following requirements are needed by this module:
 
-- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (>= 1.3.0)
+- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.3)
 
-- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (>= 1.11.0)
+- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (~> 1.13)
 
 ## Modules
 

modules/resourcegroup/main.tf

@@ -3,6 +3,6 @@ resource "azapi_resource" "rg" {
   type      = "Microsoft.Resources/resourceGroups@2021-04-01"
   name      = var.resource_group_name
   location  = var.location
-  body      = jsonencode({})
+  body      = {}
   tags      = var.tags
 }

modules/resourcegroup/terraform.tf

@@ -1,9 +1,9 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = "~> 1.6"
   required_providers {
     azapi = {
       source  = "azure/azapi"
-      version = ">= 1.11.0"
+      version = "~> 1.14"
     }
   }
 }

modules/resourceprovider/README.md

@@ -28,9 +28,9 @@ module "resourceproviders" {
 
 The following requirements are needed by this module:
 
-- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (>= 1.3.0)
+- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.3)
 
-- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (>= 1.11.0)
+- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (~> 1.11)
 
 ## Modules
 

modules/resourceprovider/terraform.tf

@@ -1,9 +1,9 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = "~> 1.6"
   required_providers {
     azapi = {
       source  = "Azure/azapi"
-      version = ">= 1.11.0"
+      version = "~> 1.14"
     }
   }
 }

modules/roleassignment/README.md

@@ -29,9 +29,9 @@ module "roleassignment" {
 
 The following requirements are needed by this module:
 
-- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (>= 1.3.0)
+- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.3)
 
-- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (>= 3.7.0)
+- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 3.7)
 
 ## Modules
 

modules/roleassignment/terraform.tf

@@ -1,9 +1,9 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = "~> 1.6"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.7.0"
+      version = "~> 3.107"
     }
   }
 }