Skip to content

Commit

Permalink
chore: support azapi v2 and improve test coverage (#81)
Browse files Browse the repository at this point in the history
* chore: improve test coverage

* Fix azapi versions

* azapi v2 fixes, grept and pre-commit
  • Loading branch information
jaredfholgate authored Dec 11, 2024
1 parent 01f0cad commit c140f2f
Show file tree
Hide file tree
Showing 40 changed files with 1,394 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
run-e2e-tests:
if: github.event.repository.name != 'terraform-azurerm-avm-template' && github.event.pull_request.head.repo.fork == false
if: github.event.pull_request.head.repo.fork == false
uses: Azure/terraform-azurerm-avm-template/.github/workflows/test-examples-template.yml@main
name: end to end
secrets: inherit
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2

- name: check docs
uses: Azure/terraform-azurerm-avm-template/.github/actions/docs-check@main
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2

- name: lint terraform
uses: Azure/terraform-azurerm-avm-template/.github/actions/linting@main
Expand All @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2

- name: avmfix
uses: Azure/terraform-azurerm-avm-template/.github/actions/avmfix@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
if: github.event.repository.name != 'terraform-azurerm-avm-template'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
- name: Check version
uses: Azure/terraform-azurerm-avm-template/.github/actions/version-check@main
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ Version: 0.3.1

Source: Azure/avm-res-network-virtualnetwork/azurerm

Version: 0.4.0
Version: 0.7.1

<!-- markdownlint-disable-next-line MD041 -->
## Data Collection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ terraform {
required_providers {
azapi = {
source = "azure/azapi"
version = "~> 1.14"
version = "~> 2.0"
}
azuredevops = {
source = "microsoft/azuredevops"
Expand Down Expand Up @@ -190,7 +190,7 @@ output "container_app_job_name" {
# Region helpers
module "regions" {
source = "Azure/avm-utl-regions/azurerm"
version = "0.1.0"
version = "0.3.0"
}
resource "random_integer" "region_index" {
Expand All @@ -217,7 +217,7 @@ The following requirements are needed by this module:

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

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

- <a name="requirement_azuredevops"></a> [azuredevops](#requirement\_azuredevops) (~> 1.1)

Expand Down Expand Up @@ -308,7 +308,7 @@ Version: >= 0.3.0

Source: Azure/avm-utl-regions/azurerm

Version: 0.1.0
Version: 0.3.0

<!-- markdownlint-disable-next-line MD041 -->
## Data Collection
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ terraform {
required_providers {
azapi = {
source = "azure/azapi"
version = "~> 1.14"
version = "~> 2.0"
}
azuredevops = {
source = "microsoft/azuredevops"
Expand Down Expand Up @@ -184,7 +184,7 @@ output "container_app_job_name" {
# Region helpers
module "regions" {
source = "Azure/avm-utl-regions/azurerm"
version = "0.1.0"
version = "0.3.0"
}

resource "random_integer" "region_index" {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ terraform {
required_providers {
azapi = {
source = "azure/azapi"
version = "~> 1.14"
version = "~> 2.0"
}
azuredevops = {
source = "microsoft/azuredevops"
Expand Down Expand Up @@ -198,7 +198,7 @@ resource "azurerm_resource_group" "this" {
module "virtual_network" {
source = "Azure/avm-res-network-virtualnetwork/azurerm"
version = "0.4.2"
version = "0.7.1"
name = "vnet-${random_string.name.result}"
resource_group_name = azurerm_resource_group.this.name
location = local.selected_region
Expand Down Expand Up @@ -246,7 +246,7 @@ output "container_app_job_name" {
# Region helpers
module "regions" {
source = "Azure/avm-utl-regions/azurerm"
version = "0.1.0"
version = "0.3.0"
}
resource "random_integer" "region_index" {
Expand All @@ -273,7 +273,7 @@ The following requirements are needed by this module:

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

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

- <a name="requirement_azuredevops"></a> [azuredevops](#requirement\_azuredevops) (~> 1.1)

Expand Down Expand Up @@ -365,13 +365,13 @@ Version: >= 0.3.0

Source: Azure/avm-utl-regions/azurerm

Version: 0.1.0
Version: 0.3.0

### <a name="module_virtual_network"></a> [virtual\_network](#module\_virtual\_network)

Source: Azure/avm-res-network-virtualnetwork/azurerm

Version: 0.4.2
Version: 0.7.1

<!-- markdownlint-disable-next-line MD041 -->
## Data Collection
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ terraform {
required_providers {
azapi = {
source = "azure/azapi"
version = "~> 1.14"
version = "~> 2.0"
}
azuredevops = {
source = "microsoft/azuredevops"
Expand Down Expand Up @@ -192,7 +192,7 @@ resource "azurerm_resource_group" "this" {

module "virtual_network" {
source = "Azure/avm-res-network-virtualnetwork/azurerm"
version = "0.4.2"
version = "0.7.1"
name = "vnet-${random_string.name.result}"
resource_group_name = azurerm_resource_group.this.name
location = local.selected_region
Expand Down Expand Up @@ -240,7 +240,7 @@ output "container_app_job_name" {
# Region helpers
module "regions" {
source = "Azure/avm-utl-regions/azurerm"
version = "0.1.0"
version = "0.3.0"
}

resource "random_integer" "region_index" {
Expand Down
File renamed without changes.
Loading

0 comments on commit c140f2f

Please sign in to comment.