diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 162131cc5..f656f61b6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,15 +37,16 @@ jobs: # Learn more about CodeQL language support at https://git.io/codeql-language-support steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Go 1.x uses: actions/setup-go@v5 with: - go-version: ^1.18 + go-version: '>=1.18' + check-latest: true id: go - - name: Checkout repository - uses: actions/checkout@v4 - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml index da224897e..27975738c 100644 --- a/.github/workflows/darwin.yaml +++ b/.github/workflows/darwin.yaml @@ -7,13 +7,14 @@ jobs: name: Build runs-on: macos-latest steps: + - name: Check out code into the Go module directory + uses: actions/checkout@v4 - name: Set up Go 1.x uses: actions/setup-go@v5 with: - go-version: ^1.16 + go-version: '>=1.18' + check-latest: true id: go - - name: Check out code into the Go module directory - uses: actions/checkout@v4 - name: Build Test run: | make blob-darwin diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index d8b6bc40e..86012a9c4 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -9,15 +9,14 @@ jobs: name: Build runs-on: ubuntu-latest steps: + - name: Check out code into the Go module directory + uses: actions/checkout@v4 - name: Set up Go 1.x uses: actions/setup-go@v5 with: - go-version: ^1.16 + go-version: '>=1.18' + check-latest: true id: go - - - name: Check out code into the Go module directory - uses: actions/checkout@v4 - - name: Run unit test run: | export PATH=$PATH:$HOME/.local/bin diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml index d811acf79..fd638e022 100644 --- a/.github/workflows/static.yaml +++ b/.github/workflows/static.yaml @@ -7,13 +7,15 @@ jobs: name: Go Lint runs-on: ubuntu-latest steps: - - name: Set up Go 1.x - uses: actions/setup-go@v5 - with: - go-version: ^1.19 - - uses: actions/checkout@master - - name: Run linter - uses: golangci/golangci-lint-action@v6 - with: - version: v1.60 - args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s + - uses: actions/checkout@master + - name: Set up Go 1.x + uses: actions/setup-go@v5 + with: + go-version: '>=1.18' + check-latest: true + id: go + - name: Run linter + uses: golangci/golangci-lint-action@v6 + with: + version: v1.60 + args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml index 8361b02a3..47e866e2b 100644 --- a/.github/workflows/trivy.yaml +++ b/.github/workflows/trivy.yaml @@ -9,15 +9,14 @@ jobs: name: Build runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v4 - name: Set up Go 1.x uses: actions/setup-go@v5 with: - go-version: 1.23.1 + go-version: '>=1.18' + check-latest: true id: go - - - name: Checkout code - uses: actions/checkout@v4 - - name: Build an image from Dockerfile run: | export PUBLISH=true diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 6b5e66aa4..dc761a1f3 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -10,13 +10,14 @@ jobs: platform: [windows-latest] runs-on: ${{ matrix.platform }} steps: + - name: Checkout code + uses: actions/checkout@v4 - name: Set up Go 1.x uses: actions/setup-go@v5 with: - go-version: ^1.16 + go-version: '>=1.18' + check-latest: true id: go - - name: Checkout code - uses: actions/checkout@v4 - name: Build Test run: | make blob-windows diff --git a/go.mod b/go.mod index 256e3e322..ce65224f5 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( k8s.io/pod-security-admission v0.30.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240805152051-72936abe6812 - sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.49 + sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.51 sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.18 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 40cd56dae..e15ce5f1f 100644 --- a/go.sum +++ b/go.sum @@ -455,8 +455,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RCh sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4= sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240805152051-72936abe6812 h1:/wecScN9etwdtLeibmyMjSrT6WwjZxmaltAUppmcj60= sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240805152051-72936abe6812/go.mod h1:lQvP3CccouEXTBu56sCNxPOPyeNwM8PlfL4+ms2C4sE= -sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.49 h1:3AsgRzy3mz/AOsofFsuzQFs2paHACDl2J0Ibd6dh+5Q= -sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.49/go.mod h1:1M90A+akyTabHVnveSKlvIO/Kk9kEr1LjRx+08twKVU= +sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.51 h1:VTNa/fNAm1FV1CVjB829WPGvFCI0p/gbyyWkIslwtyY= +sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.51/go.mod h1:ymK0BL/Q6IhmE/a/fIasOcuqtueUX0cKnzU66uVmt1w= sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.18 h1:PhXbmp06mdagpcavRWc/bAF7aNAEknuuzioI+NJgE3E= sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.18/go.mod h1:qJdztdabNCvj3MiRKT1AEOeYwhplYAodY8UPR/LwcT8= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/test/utils/azure/azure_helper.go b/test/utils/azure/azure_helper.go index ed79cf3f6..13d21bce3 100644 --- a/test/utils/azure/azure_helper.go +++ b/test/utils/azure/azure_helper.go @@ -66,7 +66,7 @@ func GetClient(cloud, subscriptionID, clientID, tenantID, clientSecret string, a if err != nil { return nil, err } - roleclient, err := roledefinitionclient.New(subscriptionID, cred, nil) + roleclient, err := roledefinitionclient.New(cred, nil) if err != nil { return nil, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 5003c1027..aea68c5b2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1619,8 +1619,8 @@ sigs.k8s.io/cloud-provider-azure/pkg/util/string sigs.k8s.io/cloud-provider-azure/pkg/util/taints sigs.k8s.io/cloud-provider-azure/pkg/util/vm sigs.k8s.io/cloud-provider-azure/pkg/version -# sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.49 -## explicit; go 1.22 +# sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.51 +## explicit; go 1.23.1 sigs.k8s.io/cloud-provider-azure/pkg/azclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/mock_accountclient diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/roledefinitionclient/zz_generated_client.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/roledefinitionclient/zz_generated_client.go index 8d94af4a5..e4c66843d 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/roledefinitionclient/zz_generated_client.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/roledefinitionclient/zz_generated_client.go @@ -32,7 +32,7 @@ type Client struct { tracer tracing.Tracer } -func New(subscriptionID string, credential azcore.TokenCredential, options *arm.ClientOptions) (Interface, error) { +func New(credential azcore.TokenCredential, options *arm.ClientOptions) (Interface, error) { if options == nil { options = utils.GetDefaultOption() }