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.

Sign up for GitHub

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

chore: support azapi v2 and improve test coverage #81

Merged
merged 3 commits into from
Dec 11, 2024
Merged

chore: support azapi v2 and improve test coverage #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83fad1a
chore: improve test coverage
jaredfholgate Dec 11, 2024
ba10af7
Fix azapi versions
jaredfholgate Dec 11, 2024
6f8bba8
azapi v2 fixes, grept and pre-commit
jaredfholgate Dec 11, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions examples/default/README.md → examples/azure_devops_basic/README.md
View file
Open in desktop
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
0 examples/bring_your_own_vnet/_footer.md → examples/azure_devops_basic/_footer.md
View file
Open in desktop
File renamed without changes.
0 examples/default/_header.md → examples/azure_devops_basic/_header.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions examples/default/main.tf → examples/azure_devops_basic/main.tf
View file
Open in desktop
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
0 examples/bring_your_own_vnet/pipeline.yml → examples/azure_devops_basic/pipeline.yml
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions examples/bring_your_own_vnet/README.md → ...zure_devops_bring_your_own_vnet/README.md
View file
Open in desktop
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
0 examples/default/_footer.md → ...ure_devops_bring_your_own_vnet/_footer.md
View file
Open in desktop
File renamed without changes.
0 examples/bring_your_own_vnet/_header.md → ...ure_devops_bring_your_own_vnet/_header.md
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions examples/bring_your_own_vnet/main.tf → .../azure_devops_bring_your_own_vnet/main.tf
View file
Open in desktop
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
0 examples/default/pipeline.yml → ...e_devops_bring_your_own_vnet/pipeline.yml
View file
Open in desktop
File renamed without changes.
Loading
Loading