Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

cli: rename upgrade execute to upgrade apply

Browse Source
This commit is contained in:
Otto Bittner 2023-02-01 10:56:47 +01:00
parent 109177880e
commit 91e27ac186
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/internal/cmd/upgrade.go
View File

@ -20,7 +20,7 @@ func NewUpgradeCmd() *cobra.Command {
}
cmd.AddCommand(newUpgradeCheckCmd())
cmd.AddCommand(newUpgradeExecuteCmd())
cmd.AddCommand(newUpgradeApplyCmd())
return cmd
}

32
cli/internal/cmd/upgradeexecute.go → cli/internal/cmd/upgradeapply.go
View File

@ -22,13 +22,13 @@ import (
"github.com/spf13/cobra"
)
func newUpgradeExecuteCmd() *cobra.Command {
func newUpgradeApplyCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "execute",
Short: "Execute an upgrade of a Constellation cluster",
Long: "Execute an upgrade of a Constellation cluster by applying the chosen configuration.",
Short: "Apply an upgrade to a Constellation cluster",
Long: "Apply an upgrade to a Constellation cluster by applying the chosen configuration.",
Args: cobra.NoArgs,
RunE: runUpgradeExecute,
RunE: runUpgradeApply,
}
cmd.Flags().Bool("helm", false, "execute helm upgrade\n"+
@ -47,7 +47,7 @@ func newUpgradeExecuteCmd() *cobra.Command {
return cmd
}
func runUpgradeExecute(cmd *cobra.Command, args []string) error {
func runUpgradeApply(cmd *cobra.Command, args []string) error {
log, err := newCLILogger(cmd)
if err != nil {
return fmt.Errorf("creating logger: %w", err)
@ -61,11 +61,11 @@ func runUpgradeExecute(cmd *cobra.Command, args []string) error {
return err
}
return upgradeExecute(cmd, imageFetcher, upgrader, fileHandler)
return upgradeApply(cmd, imageFetcher, upgrader, fileHandler)
}
func upgradeExecute(cmd *cobra.Command, imageFetcher imageFetcher, upgrader cloudUpgrader, fileHandler file.Handler) error {
flags, err := parseUpgradeExecuteFlags(cmd)
func upgradeApply(cmd *cobra.Command, imageFetcher imageFetcher, upgrader cloudUpgrader, fileHandler file.Handler) error {
flags, err := parseUpgradeApplyFlags(cmd)
if err != nil {
return fmt.Errorf("parsing flags: %w", err)
}
@ -110,36 +110,36 @@ func upgradeExecute(cmd *cobra.Command, imageFetcher imageFetcher, upgrader clou
return upgrader.Upgrade(cmd.Context(), imageReference, conf.Upgrade.Image, conf.Upgrade.Measurements)
}
func parseUpgradeExecuteFlags(cmd *cobra.Command) (upgradeExecuteFlags, error) {
func parseUpgradeApplyFlags(cmd *cobra.Command) (upgradeApplyFlags, error) {
configPath, err := cmd.Flags().GetString("config")
if err != nil {
return upgradeExecuteFlags{}, err
return upgradeApplyFlags{}, err
}
helmFlag, err := cmd.Flags().GetBool("helm")
if err != nil {
return upgradeExecuteFlags{}, err
return upgradeApplyFlags{}, err
}
yes, err := cmd.Flags().GetBool("yes")
if err != nil {
return upgradeExecuteFlags{}, err
return upgradeApplyFlags{}, err
}
timeout, err := cmd.Flags().GetDuration("timeout")
if err != nil {
return upgradeExecuteFlags{}, err
return upgradeApplyFlags{}, err
}
force, err := cmd.Flags().GetBool("force")
if err != nil {
return upgradeExecuteFlags{}, fmt.Errorf("parsing force argument: %w", err)
return upgradeApplyFlags{}, fmt.Errorf("parsing force argument: %w", err)
}
return upgradeExecuteFlags{configPath: configPath, helmFlag: helmFlag, yes: yes, upgradeTimeout: timeout, force: force}, nil
return upgradeApplyFlags{configPath: configPath, helmFlag: helmFlag, yes: yes, upgradeTimeout: timeout, force: force}, nil
}
type upgradeExecuteFlags struct {
type upgradeApplyFlags struct {
configPath string
helmFlag bool
yes bool

6
cli/internal/cmd/upgradeexecute_test.go → cli/internal/cmd/upgradeapply_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/require"
)
func TestUpgradeExecute(t *testing.T) {
func TestUpgradeApply(t *testing.T) {
testCases := map[string]struct {
upgrader stubUpgrader
imageFetcher stubImageFetcher
@ -49,7 +49,7 @@ func TestUpgradeExecute(t *testing.T) {
t.Run(name, func(t *testing.T) {
assert := assert.New(t)
require := require.New(t)
cmd := newUpgradeExecuteCmd()
cmd := newUpgradeApplyCmd()
cmd.Flags().String("config", constants.ConfigFilename, "") // register persistent flag manually
cmd.Flags().Bool("force", true, "") // register persistent flag manually
@ -57,7 +57,7 @@ func TestUpgradeExecute(t *testing.T) {
cfg := defaultConfigWithExpectedMeasurements(t, config.Default(), cloudprovider.Azure)
require.NoError(handler.WriteYAML(constants.ConfigFilename, cfg))
err := upgradeExecute(cmd, &tc.imageFetcher, tc.upgrader, handler)
err := upgradeApply(cmd, &tc.imageFetcher, tc.upgrader, handler)
if tc.wantErr {
assert.Error(err)
} else {