From 9f6134223b7002acdd8a0fb78b4cb4504eb07e76 Mon Sep 17 00:00:00 2001 From: Josh Luedeman Date: Sun, 19 Apr 2026 20:14:38 -0400 Subject: [PATCH 1/4] feat: remove azurenoops provider dependency --- .github/agents/devops.agent.md | 2 +- README.md | 14 +++++++------- docs/index.md | 14 +++++++------- locals.naming.tf | 2 +- naming.tf | 2 +- versions.tf | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/agents/devops.agent.md b/.github/agents/devops.agent.md index 6ec09e9..e0436e0 100644 --- a/.github/agents/devops.agent.md +++ b/.github/agents/devops.agent.md @@ -12,7 +12,7 @@ You are the DevOps agent. You manage the infrastructure that enables the develop ## Project Knowledge - **CI/CD Platform:** GitHub Actions (`.github/workflows/ci.yml`) — terraform-fmt, terraform-validate, tflint, terraform-plan -- **Cloud Provider:** Azure (azurerm ~>3.116, azurenoopsutils ~>1.0.4) +- **Cloud Provider:** Azure (azurerm ~>3.116, popsrox-utils ~>1.0.4) - **IaC Tool:** Terraform ≥1.9 - **Container Runtime:** N/A — this module provisions Azure Container Instances, no local container runtime - **Orchestration:** N/A — this module provisions Azure Container Groups (managed service) diff --git a/README.md b/README.md index f03865d..1861b34 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ # Azure Container Instance Overlay Terraform Module -[![Changelog](https://img.shields.io/badge/changelog-release-green.svg)](CHANGELOG.md) [![Notice](https://img.shields.io/badge/notice-copyright-yellow.svg)](NOTICE) [![MIT License](https://img.shields.io/badge/license-MIT-orange.svg)](LICENSE) [![TF Registry](https://img.shields.io/badge/terraform-registry-blue.svg)](https://registry.terraform.io/modules/azurenoops/overlays-container-instance/azurerm/) +[![Changelog](https://img.shields.io/badge/changelog-release-green.svg)](CHANGELOG.md) [![Notice](https://img.shields.io/badge/notice-copyright-yellow.svg)](NOTICE) [![MIT License](https://img.shields.io/badge/license-MIT-orange.svg)](LICENSE) [![TF Registry](https://img.shields.io/badge/terraform-registry-blue.svg)](https://registry.terraform.io/modules/POps-Rox/overlays-container-instance/azurerm/) -This Overlay terraform module can deploys and manages a [Azure Container Instance Group](https://docs.microsoft.com/en-us/azure/container-instances/container-instances-overview) This module can be used in a [SCCA compliant Network](https://registry.terraform.io/modules/azurenoops/overlays-hubspoke/azurerm/latest). +This Overlay terraform module can deploys and manages a [Azure Container Instance Group](https://docs.microsoft.com/en-us/azure/container-instances/container-instances-overview) This module can be used in a [SCCA compliant Network](https://registry.terraform.io/modules/POps-Rox/overlays-hubspoke/azurerm/latest). ## Using Azure Clouds @@ -105,29 +105,29 @@ module "mod_ampls" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9 | -| [azurenoopsutils](#requirement\_azurenoopsutils) | ~> 1.0.4 | +| [popsrox-utils](#requirement\_popsrox-utils) | ~> 1.0.4 | | [azurerm](#requirement\_azurerm) | ~> 3.116 | ## Providers | Name | Version | |------|---------| -| [azurenoopsutils](#provider\_azurenoopsutils) | ~> 1.0.4 | +| [popsrox-utils](#provider\_popsrox-utils) | ~> 1.0.4 | | [azurerm](#provider\_azurerm) | ~> 3.116 | ## Modules | Name | Source | Version | |------|--------|---------| -| [mod\_azure\_region\_lookup](#module\_mod\_azure\_region\_lookup) | azurenoops/overlays-azregions-lookup/azurerm | ~> 1.0.0 | -| [mod\_scaffold\_rg](#module\_mod\_scaffold\_rg) | azurenoops/overlays-resource-group/azurerm | ~> 1.0.1 | +| [mod\_azure\_region\_lookup](#module\_mod\_azure\_region\_lookup) | POps-Rox/overlays-azregions-lookup/azurerm | ~> 1.0.0 | +| [mod\_scaffold\_rg](#module\_mod\_scaffold\_rg) | POps-Rox/overlays-resource-group/azurerm | ~> 1.0.1 | ## Resources | Name | Type | |------|------| | [azurerm_container_group.aci](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/container_group) | resource | -| [azurenoopsutils_resource_name.aci](https://registry.terraform.io/providers/azurenoops/azurenoopsutils/latest/docs/data-sources/resource_name) | data source | +| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/popsrox-utils/latest/docs/data-sources/resource_name) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | | [azurerm_resource_group.rgrp](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | diff --git a/docs/index.md b/docs/index.md index f03865d..1861b34 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,9 +8,9 @@ # Azure Container Instance Overlay Terraform Module -[![Changelog](https://img.shields.io/badge/changelog-release-green.svg)](CHANGELOG.md) [![Notice](https://img.shields.io/badge/notice-copyright-yellow.svg)](NOTICE) [![MIT License](https://img.shields.io/badge/license-MIT-orange.svg)](LICENSE) [![TF Registry](https://img.shields.io/badge/terraform-registry-blue.svg)](https://registry.terraform.io/modules/azurenoops/overlays-container-instance/azurerm/) +[![Changelog](https://img.shields.io/badge/changelog-release-green.svg)](CHANGELOG.md) [![Notice](https://img.shields.io/badge/notice-copyright-yellow.svg)](NOTICE) [![MIT License](https://img.shields.io/badge/license-MIT-orange.svg)](LICENSE) [![TF Registry](https://img.shields.io/badge/terraform-registry-blue.svg)](https://registry.terraform.io/modules/POps-Rox/overlays-container-instance/azurerm/) -This Overlay terraform module can deploys and manages a [Azure Container Instance Group](https://docs.microsoft.com/en-us/azure/container-instances/container-instances-overview) This module can be used in a [SCCA compliant Network](https://registry.terraform.io/modules/azurenoops/overlays-hubspoke/azurerm/latest). +This Overlay terraform module can deploys and manages a [Azure Container Instance Group](https://docs.microsoft.com/en-us/azure/container-instances/container-instances-overview) This module can be used in a [SCCA compliant Network](https://registry.terraform.io/modules/POps-Rox/overlays-hubspoke/azurerm/latest). ## Using Azure Clouds @@ -105,29 +105,29 @@ module "mod_ampls" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9 | -| [azurenoopsutils](#requirement\_azurenoopsutils) | ~> 1.0.4 | +| [popsrox-utils](#requirement\_popsrox-utils) | ~> 1.0.4 | | [azurerm](#requirement\_azurerm) | ~> 3.116 | ## Providers | Name | Version | |------|---------| -| [azurenoopsutils](#provider\_azurenoopsutils) | ~> 1.0.4 | +| [popsrox-utils](#provider\_popsrox-utils) | ~> 1.0.4 | | [azurerm](#provider\_azurerm) | ~> 3.116 | ## Modules | Name | Source | Version | |------|--------|---------| -| [mod\_azure\_region\_lookup](#module\_mod\_azure\_region\_lookup) | azurenoops/overlays-azregions-lookup/azurerm | ~> 1.0.0 | -| [mod\_scaffold\_rg](#module\_mod\_scaffold\_rg) | azurenoops/overlays-resource-group/azurerm | ~> 1.0.1 | +| [mod\_azure\_region\_lookup](#module\_mod\_azure\_region\_lookup) | POps-Rox/overlays-azregions-lookup/azurerm | ~> 1.0.0 | +| [mod\_scaffold\_rg](#module\_mod\_scaffold\_rg) | POps-Rox/overlays-resource-group/azurerm | ~> 1.0.1 | ## Resources | Name | Type | |------|------| | [azurerm_container_group.aci](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/container_group) | resource | -| [azurenoopsutils_resource_name.aci](https://registry.terraform.io/providers/azurenoops/azurenoopsutils/latest/docs/data-sources/resource_name) | data source | +| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/popsrox-utils/latest/docs/data-sources/resource_name) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | | [azurerm_resource_group.rgrp](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | diff --git a/locals.naming.tf b/locals.naming.tf index 785c77a..a99416a 100644 --- a/locals.naming.tf +++ b/locals.naming.tf @@ -5,5 +5,5 @@ locals { resource_group_name = element(coalescelist(data.azurerm_resource_group.rgrp.*.name, module.mod_scaffold_rg.*.resource_group_name, [""]), 0) location = element(coalescelist(data.azurerm_resource_group.rgrp.*.location, module.mod_scaffold_rg.*.resource_group_location, [""]), 0) - azure_container_instance_name = coalesce(var.custom_azure_container_instance_name, data.azurenoopsutils_resource_name.aci.result) + azure_container_instance_name = coalesce(var.custom_azure_container_instance_name, data.popsrox_utils_resource_name.aci.result) } diff --git a/naming.tf b/naming.tf index 941864c..0e08514 100644 --- a/naming.tf +++ b/naming.tf @@ -4,7 +4,7 @@ #------------------------------------------------------------ # Azure NoOps Naming - This should be used on all resource naming #------------------------------------------------------------ -data "azurenoopsutils_resource_name" "aci" { +data "popsrox_utils_resource_name" "aci" { name = var.workload_name resource_type = "azurerm_resource_group" prefixes = [var.org_name, var.use_location_short_name ? module.mod_azure_region_lookup.location_short : var.location] diff --git a/versions.tf b/versions.tf index 101d7bb..5a8adbc 100644 --- a/versions.tf +++ b/versions.tf @@ -8,8 +8,8 @@ terraform { source = "hashicorp/azurerm" version = "~> 3.116" } - azurenoopsutils = { - source = "azurenoops/azurenoopsutils" + popsrox-utils = { + source = "POps-Rox/popsrox-utils" version = "~> 1.0.4" } } From c7d96bd6668613e2f38273cef6d193a6da5b6ade Mon Sep 17 00:00:00 2001 From: Josh Luedeman Date: Sun, 19 Apr 2026 20:15:28 -0400 Subject: [PATCH 2/4] fix: correct provider source to POps-Rox/azutils --- README.md | 2 +- docs/index.md | 2 +- versions.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1861b34..ced9aea 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ module "mod_ampls" { | Name | Type | |------|------| | [azurerm_container_group.aci](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/container_group) | resource | -| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/popsrox-utils/latest/docs/data-sources/resource_name) | data source | +| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/azutils/latest/docs/data-sources/resource_name) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | | [azurerm_resource_group.rgrp](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | diff --git a/docs/index.md b/docs/index.md index 1861b34..ced9aea 100644 --- a/docs/index.md +++ b/docs/index.md @@ -127,7 +127,7 @@ module "mod_ampls" { | Name | Type | |------|------| | [azurerm_container_group.aci](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/container_group) | resource | -| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/popsrox-utils/latest/docs/data-sources/resource_name) | data source | +| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/azutils/latest/docs/data-sources/resource_name) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | | [azurerm_resource_group.rgrp](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | diff --git a/versions.tf b/versions.tf index 5a8adbc..fd940d3 100644 --- a/versions.tf +++ b/versions.tf @@ -9,7 +9,7 @@ terraform { version = "~> 3.116" } popsrox-utils = { - source = "POps-Rox/popsrox-utils" + source = "POps-Rox/azutils" version = "~> 1.0.4" } } From 51e5e10f0dd2c46c0ab2d0802c48fc75893e6779 Mon Sep 17 00:00:00 2001 From: Josh Luedeman Date: Sun, 19 Apr 2026 20:36:56 -0400 Subject: [PATCH 3/4] fix: correct resource type name to popsrox_resource_name --- README.md | 2 +- docs/index.md | 2 +- locals.naming.tf | 2 +- naming.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ced9aea..fa53b31 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ module "mod_ampls" { | Name | Type | |------|------| | [azurerm_container_group.aci](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/container_group) | resource | -| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/azutils/latest/docs/data-sources/resource_name) | data source | +| [popsrox_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/azutils/latest/docs/data-sources/resource_name) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | | [azurerm_resource_group.rgrp](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | diff --git a/docs/index.md b/docs/index.md index ced9aea..fa53b31 100644 --- a/docs/index.md +++ b/docs/index.md @@ -127,7 +127,7 @@ module "mod_ampls" { | Name | Type | |------|------| | [azurerm_container_group.aci](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/container_group) | resource | -| [popsrox_utils_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/azutils/latest/docs/data-sources/resource_name) | data source | +| [popsrox_resource_name.aci](https://registry.terraform.io/providers/POps-Rox/azutils/latest/docs/data-sources/resource_name) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | | [azurerm_resource_group.rgrp](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | diff --git a/locals.naming.tf b/locals.naming.tf index a99416a..7d9b79c 100644 --- a/locals.naming.tf +++ b/locals.naming.tf @@ -5,5 +5,5 @@ locals { resource_group_name = element(coalescelist(data.azurerm_resource_group.rgrp.*.name, module.mod_scaffold_rg.*.resource_group_name, [""]), 0) location = element(coalescelist(data.azurerm_resource_group.rgrp.*.location, module.mod_scaffold_rg.*.resource_group_location, [""]), 0) - azure_container_instance_name = coalesce(var.custom_azure_container_instance_name, data.popsrox_utils_resource_name.aci.result) + azure_container_instance_name = coalesce(var.custom_azure_container_instance_name, data.popsrox_resource_name.aci.result) } diff --git a/naming.tf b/naming.tf index 0e08514..94ca5f9 100644 --- a/naming.tf +++ b/naming.tf @@ -4,7 +4,7 @@ #------------------------------------------------------------ # Azure NoOps Naming - This should be used on all resource naming #------------------------------------------------------------ -data "popsrox_utils_resource_name" "aci" { +data "popsrox_resource_name" "aci" { name = var.workload_name resource_type = "azurerm_resource_group" prefixes = [var.org_name, var.use_location_short_name ? module.mod_azure_region_lookup.location_short : var.location] From d8b000b163e9abee2cdacc0e7a2cce324ee081b3 Mon Sep 17 00:00:00 2001 From: Josh Luedeman Date: Sun, 19 Apr 2026 21:26:23 -0400 Subject: [PATCH 4/4] fix: rename provider local name from popsrox-utils to popsrox --- versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.tf b/versions.tf index fd940d3..477126c 100644 --- a/versions.tf +++ b/versions.tf @@ -8,9 +8,9 @@ terraform { source = "hashicorp/azurerm" version = "~> 3.116" } - popsrox-utils = { + popsrox = { source = "POps-Rox/azutils" - version = "~> 1.0.4" + version = "~> 1.0" } } }