Skip to content

Commit 0f599b9

Browse files
jujubotjujubot
authored
Merge pull request juju#17903 from hpidcock/merge-3.1-3.4-20240812
juju#17903 Forward ports: - juju#17792 - juju#17788 - juju#17793 - juju#17794 - juju#17811 - juju#17825 - juju#17867 - juju#17871 - juju#17868 - juju#17870 - juju#17877 - juju#17879 - juju#17896 - juju#17901 Conflicts: - .github/workflows/static-analysis.yml - go.mod - go.sum - provider/azure/internal/errorutils/errors_test.go - scripts/win-installer/setup.iss - snap/snapcraft.yaml - version/version.go
2 parents dde9071 + 2840741 commit 0f599b9

File tree

11 files changed

+229
-79
lines changed

11 files changed

+229
-79
lines changed

‎.github/workflows/static-analysis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,25 @@ jobs:
5757
libdqlite-dev \
5858
libsqlite3-dev \
5959
sqlite3
60-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
60+
go install golang.org/x/vuln/cmd/govulncheck@latest
61+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.59.1
6162
sudo curl -sSfL https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_linux_$(go env GOARCH) -o /usr/bin/shfmt
6263
sudo chmod +x /usr/bin/shfmt
6364
6465
- name: Download Dependencies
6566
run: go mod download
6667

6768
- name: "Static Analysis: Copyright"
68-
if: steps.filter.outputs.static-analysis == 'true' || steps.filter.outputs.go == 'true'
6969
run: |
7070
STATIC_ANALYSIS_JOB=test_copyright make static-analysis
7171
shell: bash
7272

7373
- name: "Static Analysis: Shell Check"
74-
if: steps.filter.outputs.static-analysis == 'true' || steps.filter.outputs.sh == 'true'
7574
run: |
7675
STATIC_ANALYSIS_JOB=test_static_analysis_shell make static-analysis
7776
shell: bash
7877

7978
- name: "Static Analysis: Go Check"
80-
if: steps.filter.outputs.static-analysis == 'true' || steps.filter.outputs.go == 'true'
8179
run: |
8280
# Explicitly set GOROOT to avoid golangci-lint/issues/3107
8381
export "GOROOT=$(go env GOROOT)"
@@ -90,7 +88,6 @@ jobs:
9088
CGO_LDFLAGS_ALLOW: "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
9189

9290
- name: "Static Analysis: Python Check"
93-
if: steps.filter.outputs.static-analysis == 'true' || steps.filter.outputs.python == 'true'
9491
run: |
9592
STATIC_ANALYSIS_JOB=test_static_analysis_python make static-analysis
9693
shell: bash

‎.github/workflows/upgrade.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ jobs:
6464
- name: Checkout
6565
uses: actions/checkout@v4
6666

67+
- name: Remove LXD
68+
if: env.RUN_TEST == 'RUN'
69+
run: |
70+
set -euxo pipefail
71+
sudo snap remove lxd --purge
72+
6773
- name: Setup LXD
6874
if: matrix.cloud == 'localhost'
6975
uses: canonical/setup-lxd@4e959f8e0d9c5feb27d44c5e4d9a330a782edee0

‎apiserver/common/tools_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (s *getToolsSuite) TestOSTools(c *gc.C) {
128128

129129
current := coretesting.CurrentVersion()
130130
currentCopy := current
131-
currentCopy.Release = coretesting.HostSeries(c)
131+
currentCopy.Release = "jammy"
132132
configAttrs := map[string]interface{}{
133133
"name": "some-name",
134134
"type": "some-type",

‎go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/juju/juju
33
go 1.21
44

55
require (
6-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
7-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0
7+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0
88
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3 v3.0.0-beta.2
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2 v2.0.0
1010
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0
@@ -36,7 +36,7 @@ require (
3636
github.com/google/go-querystring v1.1.0
3737
github.com/google/uuid v1.6.0
3838
github.com/gorilla/mux v1.8.1
39-
github.com/gorilla/schema v1.2.1
39+
github.com/gorilla/schema v1.4.1
4040
github.com/gorilla/websocket v1.5.1
4141
github.com/gosuri/uitable v0.0.4
4242
github.com/hashicorp/vault/api v1.10.0
@@ -105,13 +105,13 @@ require (
105105
github.com/vishvananda/netlink v1.2.1-beta.2
106106
github.com/vmware/govmomi v0.34.1
107107
go.uber.org/mock v0.4.0
108-
golang.org/x/crypto v0.25.0
109-
golang.org/x/net v0.27.0
108+
golang.org/x/crypto v0.26.0
109+
golang.org/x/net v0.28.0
110110
golang.org/x/oauth2 v0.21.0
111-
golang.org/x/sync v0.7.0
112-
golang.org/x/sys v0.22.0
113-
golang.org/x/time v0.5.0
114-
golang.org/x/tools v0.23.0
111+
golang.org/x/sync v0.8.0
112+
golang.org/x/sys v0.24.0
113+
golang.org/x/time v0.6.0
114+
golang.org/x/tools v0.24.0
115115
google.golang.org/api v0.154.0
116116
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
117117
gopkg.in/httprequest.v1 v1.2.1
@@ -133,7 +133,7 @@ require (
133133

134134
require (
135135
cloud.google.com/go/compute/metadata v0.3.0 // indirect
136-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
136+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
137137
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 // indirect
138138
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
139139
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
@@ -164,7 +164,7 @@ require (
164164
github.com/distribution/reference v0.5.0 // indirect
165165
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
166166
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
167-
github.com/fatih/color v1.14.1 // indirect
167+
github.com/fatih/color v1.16.0 // indirect
168168
github.com/felixge/httpsnoop v1.0.4 // indirect
169169
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
170170
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -194,7 +194,7 @@ require (
194194
github.com/hashicorp/errwrap v1.1.0 // indirect
195195
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
196196
github.com/hashicorp/go-multierror v1.1.1 // indirect
197-
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
197+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
198198
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
199199
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
200200
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
@@ -289,12 +289,12 @@ require (
289289
go.opentelemetry.io/otel/trace v1.21.0 // indirect
290290
go.uber.org/multierr v1.11.0 // indirect
291291
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
292-
golang.org/x/mod v0.19.0 // indirect
293-
golang.org/x/term v0.22.0 // indirect
294-
golang.org/x/text v0.16.0 // indirect
292+
golang.org/x/mod v0.20.0 // indirect
293+
golang.org/x/term v0.23.0 // indirect
294+
golang.org/x/text v0.17.0 // indirect
295295
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
296296
google.golang.org/grpc v1.59.0 // indirect
297-
google.golang.org/protobuf v1.31.0 // indirect
297+
google.golang.org/protobuf v1.33.0 // indirect
298298
gopkg.in/errgo.v1 v1.0.1 // indirect
299299
gopkg.in/gobwas/glob.v0 v0.2.3 // indirect
300300
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)