chore: merge 3.6 to main

Author: nvinuesa

.github/workflows/docs-sphinx-python-dependency-build-checks.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Install dependencies
         run: |
           set -ex
-          sudo apt update
+          sudo apt -y update
           sudo apt -y install \
             cargo \
             libpython3-dev \

api/apiclient.go

@@ -359,7 +359,6 @@ func (c *conn) connectStream(path string, attrs url.Values, extraHeaders http.He
 		return nil, errors.Trace(err)
 	}
 	requestHeader.Set(params.JujuClientVersion, jujuversion.Current.String())
-	requestHeader.Set("Origin", "http://localhost/")
 	for header, values := range extraHeaders {
 		for _, value := range values {
 			requestHeader.Add(header, value)

apiserver/server_test.go

@@ -201,7 +201,6 @@ func dialWebsocket(c *gc.C, addr, path string) (*websocket.Conn, error) {
 	// TODO(rogpeppe) merge this with the very similar dialWebsocketFromURL function.
 	url := fmt.Sprintf("wss://%s%s", addr, path)
 	header := make(http.Header)
-	header.Set("Origin", "http://localhost/")
 	caCerts := x509.NewCertPool()
 	c.Assert(caCerts.AppendCertsFromPEM([]byte(coretesting.CACert)), jc.IsTrue)
 	tlsConfig := jujuhttp.SecureTLSConfig()

cmd/juju/application/refresh.go

@@ -130,6 +130,9 @@ type refreshCommand struct {
 	NewRefresherFactory   func(refresher.RefresherDependencies) refresher.RefresherFactory
 
 	ApplicationName string
+
+	// Base represents the base (eg [email protected]) of the new charm to use
+	Base string
 	// Force should be ubiquitous and we should eventually deprecate both
 	// ForceUnits and ForceBase; instead just using "force"
 	Force      bool
@@ -181,12 +184,12 @@ updated copy of the charm.
 
 Deploying from a path is intended to suit the workflow of a charm author working
 on a single client machine; use of this deployment method from multiple clients
-is not supported and may lead to confusing behaviour. Each local packaged charm 
-gets uploaded with the revision specified in the charm, if possible, otherwise 
+is not supported and may lead to confusing behaviour. Each local packaged charm
+gets uploaded with the revision specified in the charm, if possible, otherwise
 it gets a unique revision (highest in state + 1).
 
 When deploying from a path, the --path option is used to specify the location
-of the packaged charm. Note that the charm must match what was originally used 
+of the packaged charm. Note that the charm must match what was originally used
 to deploy the charm as a superficial check that the updated charm is compatible.
 
 Resources may be uploaded at upgrade time by specifying the --resource option.
@@ -290,8 +293,10 @@ func (c *refreshCommand) SetFlags(f *gnuflag.FlagSet) {
 	f.BoolVar(&c.ForceUnits, "force-units", false, "Refresh all units immediately, even if in error state")
 	f.StringVar(&c.channelStr, "channel", "", "Channel to use when getting the charm from Charmhub")
 	f.BoolVar(&c.ForceBase, "force-series", false, "Refresh even if series of deployed applications are not supported by the new charm")
+	f.BoolVar(&c.ForceBase, "force-base", false, "Refresh even if the base of the deployed application is not supported by the new charm")
 	f.StringVar(&c.SwitchURL, "switch", "", "Crossgrade to a different charm")
-	f.StringVar(&c.CharmPath, "path", "", "Refresh to a charm package located at path")
+	f.StringVar(&c.CharmPath, "path", "", "Refresh to a charm located at path")
+	f.StringVar(&c.Base, "base", "", "Select a different base than what is currently running.")
 	f.IntVar(&c.Revision, "revision", -1, "Explicit revision of current charm")
 	f.Var(stringMap{mapping: &c.Resources}, "resource", "Resource to be uploaded to the controller")
 	f.Var(storageFlag{stores: &c.Storage, bundleStores: nil}, "storage", "Charm storage directives")
@@ -397,6 +402,17 @@ func (c *refreshCommand) Run(ctx *cmd.Context) error {
 		return errors.Errorf("%q deploy incomplete, please try refresh again in a little bit.", c.ApplicationName)
 	}
 
+	newOrigin := oldOrigin
+	if c.Base != "" {
+		if newBase, err := corebase.ParseBaseFromString(c.Base); err != nil {
+			return errors.Trace(err)
+		} else {
+			newOrigin.Base.OS = newBase.OS
+			newOrigin.Base.Channel = newBase.Channel
+
+		}
+	}
+
 	// Set a default URL schema for charm URLs that don't provide one.
 	var defaultCharmSchema = charm.CharmHub
 
@@ -453,7 +469,7 @@ func (c *refreshCommand) Run(ctx *cmd.Context) error {
 	cfg := refresher.RefresherConfig{
 		ApplicationName: c.ApplicationName,
 		CharmURL:        oldURL,
-		CharmOrigin:     oldOrigin.CoreCharmOrigin(),
+		CharmOrigin:     newOrigin.CoreCharmOrigin(),
 		CharmRef:        newRef,
 		Channel:         c.Channel,
 		Force:           c.Force,

cmd/juju/application/refresh_test.go

@@ -722,6 +722,9 @@ func (s *RefreshSuite) TestForcedSeriesUpgrade(c *gc.C) {
 		c.Fatal(errors.Annotate(err, "cannot write to metadata.yaml"))
 	}
 
+	// TODO (jam) 2024-11-15: this test is kept for backward compatibility,
+	//  in 3.x the --force-series argument exists, though it is being
+	//  replaced by --force-base
 	_, err = s.runRefresh(c, "multi-series", "--path", s.archivePath(c, repoPath), "--force-series")
 	c.Assert(err, jc.ErrorIsNil)
 
@@ -744,6 +747,94 @@ func (s *RefreshSuite) TestForcedSeriesUpgrade(c *gc.C) {
 	})
 }
 
+// func (s *RefreshSuite) TestForcedBaseUpgrade(c *gc.C) {
+// 	repoPath := testcharms.RepoWithSeries("jammy").ClonedDirPath(c.MkDir(), "multi-base")
+// 	err := runDeploy(c, repoPath, "multi-base", "--base", "[email protected]")
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	app, err := s.State.Application("multi-base")
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	ch, _, err := app.Charm()
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	c.Assert(ch.Revision(), gc.Equals, 1)
+
+// 	units, err := app.AllUnits()
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	c.Assert(units, gc.HasLen, 1)
+// 	unit := units[0]
+// 	tags := []names.UnitTag{unit.UnitTag()}
+// 	errs, err := unitassigner.New(s.APIState).AssignUnits(tags)
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	c.Assert(errs, gc.DeepEquals, make([]error, len(units)))
+
+// 	// Overwrite the manifest.yaml to change the supported series.
+// 	manifestPath := filepath.Join(repoPath, "manifest.yaml")
+// 	file, err := os.OpenFile(manifestPath, os.O_TRUNC|os.O_RDWR, 0666)
+// 	if err != nil {
+// 		c.Fatal(errors.Annotate(err, "cannot open manifest.yaml for overwriting"))
+// 	}
+// 	defer func() { _ = file.Close() }()
+
+// 	// We deployed a version of the charm that supported jammy (22.04), but
+// 	// now we declare that this charm only supports focal, but with a
+// 	// --force-base we are allowed to target it anyway.
+// 	manifest := strings.Join(
+// 		[]string{
+// 			`bases:`,
+// 			`- architectures:`,
+// 			`  - amd64`,
+// 			// Now only supports focal
+// 			`  channel: '20.04'`,
+// 			`  name: ubuntu`,
+// 		},
+// 		"\n",
+// 	)
+// 	if _, err := file.WriteString(manifest); err != nil {
+// 		c.Fatal(errors.Annotate(err, "cannot write to manifest.yaml"))
+// 	}
+
+// 	s.charmClient.charmInfo = &apicommoncharms.CharmInfo{
+// 		URL:      ch.URL(),
+// 		Meta:     ch.Meta(),
+// 		Revision: ch.Revision(),
+// 	}
+// 	// First confirm that normal refresh would be refused
+// 	_, err = s.runRefresh(c, s.cmd, "multi-base", "--path", repoPath)
+// 	c.Check(err, gc.NotNil)
+// 	c.Check(err, gc.ErrorMatches, `.*base "[email protected]" not supported by charm, the charm supported bases are: [email protected]`)
+// 	// jam (2024-11-15): The structure of this test suite is that you can only run
+// 	//  Refresh one time without reinitializing it. Since we are doing it 2x to test
+// 	//  that it fails properly before succeeding, we have to reset the internal structure
+// 	//  commands report back errors about "no model selected"
+// 	s.cmd = NewRefreshCommandForStateTest(
+// 		newCharmAdder,
+// 		func(conn base.APICallCloser) utils.CharmClient {
+// 			return &s.charmClient
+// 		},
+// 		deployer.DeployResources,
+// 		nil,
+// 	)
+
+// 	err = app.Refresh()
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	ch, _, err = app.Charm()
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	// The charm should not have changed
+// 	c.Check(ch.Revision(), gc.Equals, 1)
+
+// 	// But with --force-base we are happy
+// 	_, err = s.runRefresh(c, s.cmd, "multi-base", "--path", repoPath, "--force-base")
+// 	c.Assert(err, jc.ErrorIsNil)
+
+// 	err = app.Refresh()
+// 	c.Assert(err, jc.ErrorIsNil)
+
+// 	ch, force, err := app.Charm()
+// 	c.Assert(err, jc.ErrorIsNil)
+// 	// Check charm is at revision 3 because the local charm is uploaded twice more.
+// 	c.Check(ch.Revision(), gc.Equals, 3)
+// 	c.Check(force, gc.Equals, false)
+// }
+
 func (s *RefreshSuite) TestForcedUnitsUpgrade(c *gc.C) {
 	s.BaseRefreshSuite.setup(c, corebase.MustParseBaseFromString("[email protected]"), charm.MustParseURL("ch:riak"), charm.MustParseURL("ch:riak"))
 	s.charmAPIClient.charmOrigin = commoncharm.Origin{Base: corebase.MustParseBaseFromString("[email protected]")}

cmd/juju/user/login.go

@@ -398,7 +398,7 @@ func (c *loginCommand) publicControllerLogin(
 				})
 			},
 		),
-		api.NewLegacyLoginProvider(names.UserTag{}, "", "", nil, bclient, cookieURL),
+		api.NewLegacyLoginProvider(nil, "", "", nil, bclient, cookieURL),
 	)
 
 	// Keep track of existing interactors as the dial callback will create

cmd/plugins/juju-metadata/imagemetadata.go

@@ -164,11 +164,15 @@ func (c *imageMetadataCommand) setParams(context *cmd.Context, base corebase.Bas
 					c.Endpoint = cloudSpec.Endpoint
 				}
 			}
-			cfg := environ.Config()
 
-			// If we have a base, overwrite that from the environment.
-			if b := config.PreferredBase(cfg); !b.Empty() {
-				base = b
+			// If we don't have a base set, then look up the one from the
+			// environment configuration.
+			if c.Base == "" {
+				cfg := environ.Config()
+
+				if b := config.PreferredBase(cfg); !b.Empty() {
+					base = b
+				}
 			}
 		} else {
 			logger.Warningf("bootstrap parameters could not be opened: %v", err)

cmd/plugins/juju-metadata/imagemetadata_test.go

@@ -184,6 +184,23 @@ func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnv(c *gc.C) {
 	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)
 }
 
+func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnvWithoutUsingBase(c *gc.C) {
+	ctx, err := runImageMetadata(c, s.store,
+		"-d", s.dir, "-c", "ec2-controller", "-i", "1234", "--virt-type=pv", "--storage=root", "[email protected]",
+	)
+	c.Assert(err, jc.ErrorIsNil)
+	out := cmdtesting.Stdout(ctx)
+	expected := expectedMetadata{
+		version:  "20.04",
+		arch:     "amd64",
+		region:   "us-east-1",
+		endpoint: "https://ec2.us-east-1.amazonaws.com",
+		virtType: "pv",
+		storage:  "root",
+	}
+	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)
+}
+
 func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnvWithRegionOverride(c *gc.C) {
 	ctx, err := runImageMetadata(c, s.store,
 		"-d", s.dir, "-c", "ec2-controller", "-r", "us-west-1", "-u", "https://ec2.us-west-1.amazonaws.com", "-i", "1234",

go.mod

@@ -14,19 +14,19 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
 	github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0
 	github.com/EvilSuperstars/go-cidrman v0.0.0-20190607145828-28e79e32899a
-	github.com/aws/aws-sdk-go-v2 v1.24.0
+	github.com/aws/aws-sdk-go-v2 v1.32.5
 	github.com/aws/aws-sdk-go-v2/config v1.26.2
 	github.com/aws/aws-sdk-go-v2/credentials v1.16.13
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.142.0
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.193.0
 	github.com/aws/aws-sdk-go-v2/service/ecr v1.24.6
 	github.com/aws/aws-sdk-go-v2/service/iam v1.28.6
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7
-	github.com/aws/smithy-go v1.19.0
+	github.com/aws/smithy-go v1.22.1
 	github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f
 	github.com/canonical/go-dqlite v1.21.0
 	github.com/canonical/lxd v0.0.0-20231214113525-e676fc63c50a
-	github.com/canonical/pebble v1.16.0
 	github.com/canonical/sqlair v0.0.0-20240417091145-13970327005b
+	github.com/canonical/pebble v1.17.0
 	github.com/chzyer/readline v1.5.1
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/docker/distribution v2.8.3+incompatible
@@ -147,13 +147,13 @@ require (
 	github.com/adrg/xdg v0.3.3 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect