Skip to content

Commit

Permalink
go: updating to use Go v1.17.5 (hashicorp#14654)
Browse files Browse the repository at this point in the history
  • Loading branch information
tombuildsstuff authored Dec 17, 2021
1 parent 7e282af commit ac0e3e0
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/depscheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make depscheck
2 changes: 1 addition & 1 deletion .github/workflows/gencheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make gencheck
2 changes: 1 addition & 1 deletion .github/workflows/golint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- uses: golangci/golangci-lint-action@v2
with:
version: 'v1.41.1'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradually-deprecated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: ./scripts/run-gradually-deprecated.sh
2 changes: 1 addition & 1 deletion .github/workflows/link-milestone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: |
go install github.com/stephybun/link-milestone@latest
link-milestone
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tflint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make tflint
2 changes: 1 addition & 1 deletion .github/workflows/thirty-two-bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: GOARCH=386 GOOS=linux go build -o 32bitbuild .
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: bash scripts/gogetcookie.sh
- run: make test
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make validate-examples
2 changes: 1 addition & 1 deletion .github/workflows/website-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
go-version: '1.17.5'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make website-lint
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.3
1.17.5
9 changes: 1 addition & 8 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ tools:
build: fmtcheck generate
go install

build-docker:
mkdir -p bin
docker run --rm -v $$(pwd)/bin:/go/bin -v $$(pwd):/go/src/github.com/hashicorp/terraform-provider-azurerm -w /go/src/github.com/hashicorp/terraform-provider-azurerm -e GOOS golang:1.16 make build

fmt:
@echo "==> Fixing source code with gofmt..."
# This logic should match the search logic in scripts/gofmtcheck.sh
Expand Down Expand Up @@ -85,9 +81,6 @@ whitespace:
@echo "==> Fixing source code with whitespace linter..."
golangci-lint run ./... --no-config --disable-all --enable=whitespace --fix

test-docker:
docker run --rm -v $$(pwd):/go/src/github.com/hashicorp/terraform-provider-azurerm -w /go/src/github.com/hashicorp/terraform-provider-azurerm golang:1.13 make test

test: fmtcheck
@TEST=$(TEST) ./scripts/run-gradually-deprecated.sh
@TEST=$(TEST) ./scripts/run-test.sh
Expand Down Expand Up @@ -141,4 +134,4 @@ validate-examples:

pr-check: generate build test lint tflint website-lint

.PHONY: build build-docker test test-docker testacc vet fmt fmtcheck errcheck scaffold-website test-compile website website-test validate-examples
.PHONY: build test testacc vet fmt fmtcheck errcheck pr-check scaffold-website test-compile website website-test validate-examples
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Terraform Provider for Azure (Resource Manager)

Version 2.x of the AzureRM Provider requires Terraform 0.12.x and later, but 1.0 is recommended.
Version 2.x of the AzureRM Provider supports Terraform 0.12.x and later, but we recommend using the latest version of Terraform Core (1.1 at the time of writing).

* [Terraform Website](https://www.terraform.io)
* [AzureRM Provider Documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs)
Expand All @@ -22,7 +22,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "=2.71.0"
version = "=2.91.0"
}
}
}
Expand Down Expand Up @@ -74,6 +74,7 @@ For *GNU32 Make*, make sure its bin path is added to PATH environment variable.*
For *Git Bash for Windows*, at the step of "Adjusting your PATH environment", please choose "Use Git and optional Unix tools from Windows Command Prompt".*

Or install via [Chocolatey](https://chocolatey.org/install) (`Git Bash for Windows` must be installed per steps above)

```powershell
choco install make golang terraform -y
refreshenv
Expand Down
2 changes: 1 addition & 1 deletion website/docs/index.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "=2.46.0"
version = "=2.91.0"
}
}
}
Expand Down

0 comments on commit ac0e3e0

Please sign in to comment.