forked from juju/juju
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ensure charm origins have a revision
This will be useful for a future change, since we will now be able to use the charm origin to get a revision, rather than being force to parse it from the charm url The client always fills in a revision when deploying. Also the apiserver parses from the provided charm url is a revision is not provided. This is for compatibility with old clients. In future, we will likely enforce an origin is provided in validation steps Add upgrade steps which add a revision to charm origins if it doesn't have one. Parsed from the charm url Do the same for migration on import As a flyby, on migrations make sure to export -1 as the revision for charm origins without a revision, because 0 is a valid revision for local charms.
- Loading branch information
1 parent
3a8220e
commit 9001c8d
Showing
13 changed files
with
255 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// Copyright 2023 Canonical Ltd. | ||
// Licensed under the AGPLv3, see LICENCE file for details. | ||
|
||
package upgrades | ||
|
||
func stepsFor317() []Step { | ||
return []Step{} | ||
} | ||
|
||
func stateStepsFor317() []Step { | ||
return []Step{ | ||
&upgradeStep{ | ||
description: "ensure application charm origins have revisions", | ||
targets: []Target{DatabaseMaster}, | ||
run: func(context Context) error { | ||
return context.State().EnsureApplicationCharmOriginsHaveRevisions() | ||
}, | ||
}, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Copyright 2023 Canonical Ltd. | ||
// Licensed under the AGPLv3, see LICENCE file for details. | ||
|
||
package upgrades_test | ||
|
||
import ( | ||
jc "github.com/juju/testing/checkers" | ||
"github.com/juju/version/v2" | ||
gc "gopkg.in/check.v1" | ||
|
||
"github.com/juju/juju/testing" | ||
"github.com/juju/juju/upgrades" | ||
) | ||
|
||
var v317 = version.MustParse("3.1.7") | ||
|
||
type steps317Suite struct { | ||
testing.BaseSuite | ||
} | ||
|
||
var _ = gc.Suite(&steps317Suite{}) | ||
|
||
func (s *steps317Suite) TestEnsureApplicationCharmOriginsHaveRevisions(c *gc.C) { | ||
step := findStateStep(c, v317, "ensure application charm origins have revisions") | ||
c.Assert(step.Targets(), jc.DeepEquals, []upgrades.Target{upgrades.DatabaseMaster}) | ||
} |
Oops, something went wrong.