Merge pull request #640 from alesstimec/update-juju-3.6.0

chore(go.mod): update juju dependency to 3.6.0

.github/workflows/static-analysis.yaml

@@ -75,7 +75,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.54.0
+          version: v1.61.0
           args: --print-issued-lines=true
 
   # This runs copyright-check against the codebase

.github/workflows/test_integration.yml

@@ -102,7 +102,7 @@ jobs:
       - env:
           TF_ACC: "1"
           TEST_CLOUD: ${{ matrix.action-operator.cloud }}
-        run: go test -parallel 10 -timeout 40m -v -cover ./internal/provider/
+        run: go test -parallel 1 -timeout 60m -v -cover ./internal/provider/
         timeout-minutes: 40
 
   # Run acceptance tests in a matrix with Terraform CLI versions

go.mod

@@ -1,12 +1,14 @@
 module github.com/juju/terraform-provider-juju
 
-go 1.21
+go 1.23
+
+toolchain go1.23.4
 
 require (
 	github.com/bflad/tfproviderlint v0.30.0
 	github.com/hashicorp/terraform-plugin-docs v0.19.4
-	// v3.5.3
-	github.com/juju/juju v0.0.0-20240724081236-63d460f9ee6c
+	// v3.6.0
+	github.com/juju/juju v0.0.0-20241125225906-6dec77a01480
 
 )
 
@@ -31,7 +33,7 @@ require (
 	github.com/juju/version/v2 v2.0.1
 	github.com/rs/zerolog v1.33.0
 	github.com/stretchr/testify v1.9.0
-	go.uber.org/mock v0.4.0
+	go.uber.org/mock v0.5.0
 	gopkg.in/httprequest.v1 v1.2.1
 	gopkg.in/macaroon.v2 v2.1.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -89,7 +91,7 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/cli v1.1.6 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -116,7 +118,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/juju/ansiterm v1.0.0 // indirect
 	github.com/juju/blobstore/v3 v3.0.2 // indirect
-	github.com/juju/description/v5 v5.0.4 // indirect
+	github.com/juju/description/v7 v7.0.2 // indirect
 	github.com/juju/featureflag v1.0.0 // indirect
 	github.com/juju/gnuflag v1.0.0 // indirect
 	github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect
@@ -199,17 +201,17 @@ require (
 	github.com/yuin/goldmark-meta v1.1.0 // indirect
 	github.com/zclconf/go-cty v1.15.0 // indirect
 	go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/crypto v0.30.0 // indirect
 	golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
-	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.23.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.23.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
 	google.golang.org/grpc v1.63.2 // indirect

internal/juju/machines.go

@@ -282,15 +282,16 @@ func manualProvision(client manual.ProvisioningClientAPI,
 	}
 	// Find out about the series of the machine just provisioned
 	// (because ProvisionMachine only returns machineId)
-	_, machineSeries, err := sshprovisioner.DetectSeriesAndHardwareCharacteristics(host)
+	_, machineBase, err := sshprovisioner.DetectBaseAndHardwareCharacteristics(host)
 	if err != nil {
 		return nil, errors.Annotatef(err, "error detecting hardware characteristics")
 	}
 
-	machineBase, err := base.GetBaseFromSeries(machineSeries)
+	machineSeries, err := base.GetSeriesFromBase(machineBase)
 	if err != nil {
 		return nil, err
 	}
+
 	// This might cause problems later, but today, no one except for juju internals
 	// uses the channel risk. Using the risk makes the base appear to have changed
 	// with terraform.