Skip to content

Commit ef53beb

Browse files
gerrytangerrytan
authored
Update go version, bump direct deps to latest minor/patch, address supply chain security alert, remove unused pipeline yml, configure dependabot (#158)
* Remove unused Azure Pipelines YAML * Inline Go version lookup in schema pipeline * Bump Go and go-git versions * Updated pool to ubuntu 2404 * Add Dependabot configuration * Updated Dockerfile base image to comply with supply chain security scanner * Bump direct go deps to latest minor/patch
1 parent fc71ecf commit ef53beb

588 files changed

Lines changed: 26488 additions & 51487 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.azdo/azure-pipelines.yml‎

Lines changed: 0 additions & 649 deletions
This file was deleted.

‎.azdo/azurerm-schema-update-pipeline.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ parameters:
1010
default: main
1111

1212
pool:
13-
name: pool-ubuntu-2004
13+
name: pool-ubuntu-2404
1414

1515
variables:
1616
GOBIN: '$(GOPATH)/bin' # Go binaries path
17-
GOROOT: '/usr/local/go1.11' # Go installation path
1817
GOPATH: '$(system.defaultWorkingDirectory)/gopath' # Go workspace path
1918
modulePath: '$(GOPATH)/src/github.com/$(build.repository.name)' # Path to the module's code
2019
moduleDir: '$(GOPATH)/src/github.com'
@@ -28,12 +27,19 @@ steps:
2827
name: step1
2928
3029
- script: |
31-
wget https://go.dev/dl/go1.23.3.linux-amd64.tar.gz
32-
sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.3.linux-amd64.tar.gz
33-
export GOROOT=/usr/local/go
34-
export PATH=$GOROOT/bin:$PATH
35-
go version
36-
displayName: 'Set up the Go workspace'
30+
set -euo pipefail
31+
go_version="$(awk '/^go [0-9]+\.[0-9]+(\.[0-9]+)?$/ { print $2; exit }' go.mod)"
32+
if [[ -z "${go_version}" ]]; then
33+
echo "failed to read go version from go.mod" >&2
34+
exit 1
35+
fi
36+
echo "##vso[task.setvariable variable=GO_VERSION]${go_version}"
37+
displayName: 'Read Go version from go.mod'
38+
39+
- task: GoTool@0
40+
displayName: 'Install Go from go.mod'
41+
inputs:
42+
version: $(GO_VERSION)
3743

3844
- script: |
3945
git config --global user.email "[email protected]"
@@ -53,17 +59,13 @@ steps:
5359
PAT: $(PAT)
5460
5561
- bash: |
56-
export GOROOT=/usr/local/go
57-
export PATH=$GOROOT/bin:$PATH
5862
cd aztfmigrate/.tools/generate-provider-schema
5963
pwd
6064
chmod -R +x ./run.sh
6165
./run.sh /mnt/vss/_work/1/s/terraform-provider-azurerm ${{ parameters.branch }}
6266
displayName: 'Exporting AzureRM Schema'
6367
6468
- bash: |
65-
export GOROOT=/usr/local/go
66-
export PATH=$GOROOT/bin:$PATH
6769
export TAG=$(step1.TAG)
6870
cd aztfmigrate
6971
make fmt

‎.github/dependabot.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# https://docs.github.com/en/code-security/how-tos/secure-your-supply-chain/secure-your-dependencies/configuring-dependabot-version-updates
2+
version: 2
3+
updates:
4+
- package-ecosystem: "gomod"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"
8+
groups:
9+
gomod-dependencies:
10+
patterns:
11+
- "*"
12+
allow:
13+
- dependency-type: "direct"
14+
ignore:
15+
- dependency-name: "*"
16+
update-types:
17+
- "version-update:semver-major"

‎go.mod‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
module github.com/Azure/aztfmigrate
22

3-
go 1.24.0
4-
5-
toolchain go1.24.5
3+
go 1.25.10
64

75
require (
8-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1
97
github.com/gertd/go-pluralize v0.2.1
108
github.com/golang-jwt/jwt/v4 v4.5.2
11-
github.com/hashicorp/go-version v1.7.0
12-
github.com/hashicorp/hc-install v0.9.0
13-
github.com/hashicorp/hcl/v2 v2.22.0
14-
github.com/hashicorp/terraform-exec v0.21.0
15-
github.com/hashicorp/terraform-json v0.22.1
16-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
9+
github.com/hashicorp/go-version v1.9.0
10+
github.com/hashicorp/hc-install v0.9.5
11+
github.com/hashicorp/hcl/v2 v2.24.0
12+
github.com/hashicorp/terraform-exec v0.25.2
13+
github.com/hashicorp/terraform-json v0.27.2
14+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1
1715
github.com/magodo/aztft v0.3.1-0.20260219230708-1e51977ce1cb
1816
github.com/magodo/tfadd v0.10.1-0.20240902124619-bd18a56f410d
1917
github.com/mitchellh/cli v1.1.5
20-
github.com/zclconf/go-cty v1.15.0
18+
github.com/zclconf/go-cty v1.18.1
2119
)
2220

2321
require (
2422
dario.cat/mergo v1.0.1 // indirect
25-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0 // indirect
26-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
23+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 // indirect
2724
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/alertsmanagement/armalertsmanagement v0.10.0 // indirect
2825
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v3 v3.0.0 // indirect
2926
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers/v3 v3.1.0 // indirect
@@ -74,27 +71,23 @@ require (
7471
github.com/Masterminds/goutils v1.1.1 // indirect
7572
github.com/Masterminds/semver/v3 v3.3.0 // indirect
7673
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
77-
github.com/Microsoft/go-winio v0.6.2 // indirect
7874
github.com/agext/levenshtein v1.2.3 // indirect
7975
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
8076
github.com/armon/go-radix v1.0.0 // indirect
8177
github.com/bgentry/speakeasy v0.2.0 // indirect
82-
github.com/cloudflare/circl v1.6.0 // indirect
83-
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
8478
github.com/fatih/color v1.17.0 // indirect
85-
github.com/go-git/go-git/v5 v5.13.2 // indirect
86-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
79+
github.com/go-git/go-git/v5 v5.19.0 // indirect
8780
github.com/golang/protobuf v1.5.4 // indirect
88-
github.com/google/go-cmp v0.6.0 // indirect
81+
github.com/google/go-cmp v0.7.0 // indirect
8982
github.com/google/uuid v1.6.0 // indirect
9083
github.com/hashicorp/errwrap v1.1.0 // indirect
91-
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
92-
github.com/hashicorp/go-hclog v1.5.0 // indirect
84+
github.com/hashicorp/go-cty v1.5.0 // indirect
85+
github.com/hashicorp/go-hclog v1.6.3 // indirect
9386
github.com/hashicorp/go-multierror v1.1.1 // indirect
9487
github.com/hashicorp/go-uuid v1.0.3 // indirect
9588
github.com/hashicorp/logutils v1.0.0 // indirect
96-
github.com/hashicorp/terraform-plugin-go v0.23.0 // indirect
97-
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
89+
github.com/hashicorp/terraform-plugin-go v0.31.0 // indirect
90+
github.com/hashicorp/terraform-plugin-log v0.10.0 // indirect
9891
github.com/huandu/xstrings v1.5.0 // indirect
9992
github.com/magodo/armid v0.0.0-20250724105512-5cedfa9dd8e2 // indirect
10093
github.com/magodo/tfpluginschema v0.0.0-20240902090353-0525d7d8c1c2 // indirect
@@ -108,18 +101,17 @@ require (
108101
github.com/mitchellh/reflectwalk v1.0.2 // indirect
109102
github.com/posener/complete v1.2.3 // indirect
110103
github.com/shopspring/decimal v1.4.0 // indirect
111-
github.com/skeema/knownhosts v1.3.1 // indirect
112104
github.com/spf13/cast v1.7.0 // indirect
113105
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
114106
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
115107
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
116-
golang.org/x/crypto v0.42.0 // indirect
117-
golang.org/x/mod v0.27.0 // indirect
118-
golang.org/x/net v0.44.0 // indirect
119-
golang.org/x/sync v0.17.0 // indirect
120-
golang.org/x/sys v0.36.0 // indirect
121-
golang.org/x/text v0.29.0 // indirect
122-
golang.org/x/tools v0.36.0 // indirect
108+
golang.org/x/crypto v0.50.0 // indirect
109+
golang.org/x/mod v0.35.0 // indirect
110+
golang.org/x/net v0.53.0 // indirect
111+
golang.org/x/sync v0.20.0 // indirect
112+
golang.org/x/sys v0.43.0 // indirect
113+
golang.org/x/text v0.36.0 // indirect
114+
golang.org/x/tools v0.43.0 // indirect
123115
google.golang.org/appengine v1.6.8 // indirect
124-
google.golang.org/protobuf v1.34.0 // indirect
116+
google.golang.org/protobuf v1.36.11 // indirect
125117
)

0 commit comments

Comments
 (0)