Skip to content

Commit

Permalink
fix: cap azapi at < 2.0 and tf at < 2.0 (#427)
Browse files Browse the repository at this point in the history
* fix: cap azapi at < 2.0 and tf at < 2.0

* docs: make docs

* fix: typo, fixes #416

* docs: make docs

* chore: remove dependabot version (not security) updates

* chore: update terraform docs

* chore: bump go version

* fix: constrain test provider versions to majors
  • Loading branch information
matt-FFFFFF authored Oct 29, 2024
1 parent f4a947a commit dee26d3
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 26 deletions.
12 changes: 0 additions & 12 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/docs-fmt-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: '1.20.x'
go-version: '1.23.x'
cache-dependency-path: tests/go.sum

- name: Install tools
Expand Down
4 changes: 2 additions & 2 deletions .tfdocs-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

formatter: "markdown document" # this is required

version: "~> 0.17.0"
version: "~> 0.19"

header-from: "header.md"
footer-from: "footer.md"
Expand All @@ -18,7 +18,7 @@ sections:
show: []

hide-all: false # deprecated in v0.13.0, removed in v0.15.0
show-all: true # deprecated in v0.13.0, removed in v0.15.0
show-all: true # deprecated in v0.13.0, removed in v0.15.0

content: |-
{{ .Header }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ tfclean:
tools:
go install mvdan.cc/gofumpt@latest
go install github.com/katbyte/terrafmt@latest
go install github.com/terraform-docs/terraform-docs@v0.17.0
go install github.com/terraform-docs/terraform-docs@v0.19
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH || $$GOPATH)/bin v1.52.2

# Makefile targets are files, but we aren't using it like this,
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## Overview

The landing zone Terraform module is designed to accelerate deployment of individual landing zones within an Azure tenant.
We use the [AzureRM](https://registry.terraform.io/providers/hashicorp/azurerm/latest) and [AzAPI](https://registry.terraform.io/providers/azure/azapi/latest) providers to create the subscription and deploy the resources in a single `terrafom apply` step.
We use the [AzureRM](https://registry.terraform.io/providers/hashicorp/azurerm/latest) and [AzAPI](https://registry.terraform.io/providers/azure/azapi/latest) providers to create the subscription and deploy the resources in a single `terraform apply` step.

The module is designed to be instantiated many times, once for each desired landing zone.

Expand Down Expand Up @@ -136,9 +136,9 @@ 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)

## Modules

Expand Down Expand Up @@ -619,7 +619,6 @@ Default:
"Microsoft.Sql": [],
"Microsoft.Storage": [],
"Microsoft.StreamAnalytics": [],
"Microsoft.TimeSeriesInsights": [],
"Microsoft.Web": [],
"microsoft.insights": []
}
Expand Down
2 changes: 1 addition & 1 deletion header.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
## Overview

The landing zone Terraform module is designed to accelerate deployment of individual landing zones within an Azure tenant.
We use the [AzureRM](https://registry.terraform.io/providers/hashicorp/azurerm/latest) and [AzAPI](https://registry.terraform.io/providers/azure/azapi/latest) providers to create the subscription and deploy the resources in a single `terrafom apply` step.
We use the [AzureRM](https://registry.terraform.io/providers/hashicorp/azurerm/latest) and [AzAPI](https://registry.terraform.io/providers/azure/azapi/latest) providers to create the subscription and deploy the resources in a single `terraform apply` step.

The module is designed to be instantiated many times, once for each desired landing zone.

Expand Down
2 changes: 1 addition & 1 deletion locals.version.tf.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"locals": {
"module_version": "4.1.3"
"module_version": "4.1.5"
}
}
4 changes: 2 additions & 2 deletions terraform.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
terraform {
required_version = ">= 1.3.0"
required_version = "~> 1.3"
required_providers {
azapi = {
source = "azure/azapi"
version = ">= 1.4.0"
version = "~> 1.4"
}
}
}
4 changes: 2 additions & 2 deletions tests/utils/providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ func generateRequiredProvidersFile(data RequiredProvidersData, path string) erro
// If the environment variables are not set or the value is "latest", it will use the default values.
func newRequiredProvidersData() RequiredProvidersData {
var rpd RequiredProvidersData
azapiver := ">= 1.4.0"
azurermver := ">= 3.7.0"
azapiver := "~> 1.4"
azurermver := "~> 3.7"

if val := os.Getenv("AZAPI_VERSION"); val != "" && val != "latest" {
azapiver = "= " + val
Expand Down

0 comments on commit dee26d3

Please sign in to comment.