From 96bbfb50156528dcff32ee2f78b54f8ffffabdcb Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 12 Oct 2023 17:51:29 +0200 Subject: [PATCH 1/2] tooling: updating to Go 1.21 Needed since the AzureRM Provider has been updated --- .github/workflows/automation-extract-tf-resource-ids.yaml | 2 +- .github/workflows/automation-regenerate-terraform.yaml | 2 +- .github/workflows/automation-rest-api-specs-importer.yaml | 2 +- .github/workflows/automation-version-bumper.yaml | 2 +- .github/workflows/unit-test-end-to-end-microsoft-graph.yaml | 2 +- .../workflows/unit-test-end-to-end-resource-manager.yaml | 2 +- .github/workflows/unit-test-generator-go-sdk.yaml | 2 +- .github/workflows/unit-test-generator-terraform.yaml | 2 +- .github/workflows/unit-test-rest-api-specs-importer.yaml | 2 +- tools/data-api/go.mod | 2 +- tools/extract-tf-resource-ids/go.mod | 2 +- tools/generator-go-sdk/go.mod | 2 +- tools/generator-terraform/go.mod | 2 +- tools/importer-msgraph-metadata/go.mod | 2 +- tools/importer-msgraph-metadata/go.sum | 1 + tools/importer-rest-api-specs/go.mod | 2 +- tools/importer-rest-api-specs/go.sum | 3 +++ tools/sdk/go.mod | 2 +- tools/version-bumper/go.mod | 2 +- tools/wrapper-automation/go.mod | 2 +- tools/wrapper-automation/go.sum | 6 ++++++ 21 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/automation-extract-tf-resource-ids.yaml b/.github/workflows/automation-extract-tf-resource-ids.yaml index 7d5a9cb8773..fbe757c28cb 100644 --- a/.github/workflows/automation-extract-tf-resource-ids.yaml +++ b/.github/workflows/automation-extract-tf-resource-ids.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: extract TF resource ids and update PR body run: | diff --git a/.github/workflows/automation-regenerate-terraform.yaml b/.github/workflows/automation-regenerate-terraform.yaml index c931bb4f525..8a50224a4bf 100644 --- a/.github/workflows/automation-regenerate-terraform.yaml +++ b/.github/workflows/automation-regenerate-terraform.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: Setup .NET uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 diff --git a/.github/workflows/automation-rest-api-specs-importer.yaml b/.github/workflows/automation-rest-api-specs-importer.yaml index 7d95504d8c0..801bc652a3c 100644 --- a/.github/workflows/automation-rest-api-specs-importer.yaml +++ b/.github/workflows/automation-rest-api-specs-importer.yaml @@ -27,7 +27,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: Setup .NET uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 diff --git a/.github/workflows/automation-version-bumper.yaml b/.github/workflows/automation-version-bumper.yaml index 6303776faca..cd1c11dc438 100644 --- a/.github/workflows/automation-version-bumper.yaml +++ b/.github/workflows/automation-version-bumper.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: Setup .NET uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 diff --git a/.github/workflows/unit-test-end-to-end-microsoft-graph.yaml b/.github/workflows/unit-test-end-to-end-microsoft-graph.yaml index 9e0a6b391ab..b8a700c9b0e 100644 --- a/.github/workflows/unit-test-end-to-end-microsoft-graph.yaml +++ b/.github/workflows/unit-test-end-to-end-microsoft-graph.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: "Build Data API" run: | diff --git a/.github/workflows/unit-test-end-to-end-resource-manager.yaml b/.github/workflows/unit-test-end-to-end-resource-manager.yaml index 05c62e8a011..885731f9284 100644 --- a/.github/workflows/unit-test-end-to-end-resource-manager.yaml +++ b/.github/workflows/unit-test-end-to-end-resource-manager.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: "Build Data API" run: | diff --git a/.github/workflows/unit-test-generator-go-sdk.yaml b/.github/workflows/unit-test-generator-go-sdk.yaml index 78c1b9767f0..115efdbb8cc 100644 --- a/.github/workflows/unit-test-generator-go-sdk.yaml +++ b/.github/workflows/unit-test-generator-go-sdk.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: run unit tests run: | diff --git a/.github/workflows/unit-test-generator-terraform.yaml b/.github/workflows/unit-test-generator-terraform.yaml index 52ba1547bce..3c5cb91fdd4 100644 --- a/.github/workflows/unit-test-generator-terraform.yaml +++ b/.github/workflows/unit-test-generator-terraform.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: run unit tests run: | diff --git a/.github/workflows/unit-test-rest-api-specs-importer.yaml b/.github/workflows/unit-test-rest-api-specs-importer.yaml index c8daffaf759..d428c164ec5 100644 --- a/.github/workflows/unit-test-rest-api-specs-importer.yaml +++ b/.github/workflows/unit-test-rest-api-specs-importer.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.20.5' + go-version: '1.21.3' - name: run unit tests run: | diff --git a/tools/data-api/go.mod b/tools/data-api/go.mod index 7b531b28ee4..5e1db52bee7 100644 --- a/tools/data-api/go.mod +++ b/tools/data-api/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/data-api -go 1.20 +go 1.21 require ( github.com/go-chi/chi/v5 v5.0.8 diff --git a/tools/extract-tf-resource-ids/go.mod b/tools/extract-tf-resource-ids/go.mod index 5526f83486a..c5d7352c43f 100644 --- a/tools/extract-tf-resource-ids/go.mod +++ b/tools/extract-tf-resource-ids/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/extract-tf-resource-ids -go 1.20 +go 1.21 require ( github.com/go-test/deep v1.0.8 diff --git a/tools/generator-go-sdk/go.mod b/tools/generator-go-sdk/go.mod index b24e4a7e4ea..17fe2eab805 100644 --- a/tools/generator-go-sdk/go.mod +++ b/tools/generator-go-sdk/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/generator-go-sdk -go 1.20 +go 1.21 require ( github.com/hashicorp/go-azure-helpers v0.55.0 diff --git a/tools/generator-terraform/go.mod b/tools/generator-terraform/go.mod index ed2ac2d2057..5c99364d26e 100644 --- a/tools/generator-terraform/go.mod +++ b/tools/generator-terraform/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/generator-terraform -go 1.20 +go 1.21 replace github.com/hashicorp/pandora/tools/sdk => ../sdk diff --git a/tools/importer-msgraph-metadata/go.mod b/tools/importer-msgraph-metadata/go.mod index 126ce93a225..38129284fe8 100644 --- a/tools/importer-msgraph-metadata/go.mod +++ b/tools/importer-msgraph-metadata/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/importer-msgraph-metadata -go 1.19 +go 1.21 require ( github.com/davecgh/go-spew v1.1.1 diff --git a/tools/importer-msgraph-metadata/go.sum b/tools/importer-msgraph-metadata/go.sum index 8df63d125ef..87a86071740 100644 --- a/tools/importer-msgraph-metadata/go.sum +++ b/tools/importer-msgraph-metadata/go.sum @@ -249,6 +249,7 @@ golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/tools/importer-rest-api-specs/go.mod b/tools/importer-rest-api-specs/go.mod index fb790b71d59..7332120c93e 100644 --- a/tools/importer-rest-api-specs/go.mod +++ b/tools/importer-rest-api-specs/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/importer-rest-api-specs -go 1.20 +go 1.21 require ( github.com/gertd/go-pluralize v0.2.1 diff --git a/tools/importer-rest-api-specs/go.sum b/tools/importer-rest-api-specs/go.sum index 92fa3ec3282..eeec3b34414 100644 --- a/tools/importer-rest-api-specs/go.sum +++ b/tools/importer-rest-api-specs/go.sum @@ -155,6 +155,7 @@ github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= @@ -236,6 +237,7 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -406,6 +408,7 @@ golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/tools/sdk/go.mod b/tools/sdk/go.mod index 5c4b42a6d35..84fca55c11d 100644 --- a/tools/sdk/go.mod +++ b/tools/sdk/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/sdk -go 1.20 +go 1.21 require github.com/hashicorp/hcl/v2 v2.10.1 diff --git a/tools/version-bumper/go.mod b/tools/version-bumper/go.mod index a805513b078..754bba99fd8 100644 --- a/tools/version-bumper/go.mod +++ b/tools/version-bumper/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/version-bumper -go 1.20 +go 1.21 require ( github.com/hashicorp/hcl/v2 v2.10.1 diff --git a/tools/wrapper-automation/go.mod b/tools/wrapper-automation/go.mod index 9f9665be010..97037ad9fec 100644 --- a/tools/wrapper-automation/go.mod +++ b/tools/wrapper-automation/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/pandora/tools/wrapper-automation -go 1.20 +go 1.21 require github.com/mitchellh/cli v1.1.4 diff --git a/tools/wrapper-automation/go.sum b/tools/wrapper-automation/go.sum index bda6572b87b..33e48419914 100644 --- a/tools/wrapper-automation/go.sum +++ b/tools/wrapper-automation/go.sum @@ -18,7 +18,9 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -36,7 +38,9 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -60,6 +64,7 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= @@ -88,6 +93,7 @@ golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 93a90d88ba0a6935f5b84ed0e6ad0f664bbd3de6 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 12 Oct 2023 17:51:57 +0200 Subject: [PATCH 2/2] removing the bump file to trigger a build --- data/.bump | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/.bump diff --git a/data/.bump b/data/.bump deleted file mode 100644 index e69de29bb2d..00000000000