airship/airshipctl
Code Issues Proposed changes

Merge "Update Validation Logic for Clusterctl Move"

Browse Source
This commit is contained in:
Zuul 2021-05-26 04:03:58 +00:00 committed by Gerrit Code Review
commit cc5221972a
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/phase/executors/clusterctl.go
View File

@ -181,9 +181,6 @@ func (c *ClusterctlExecutor) Validate() error {
return phaseerrors.ErrInvalidPhase{Reason: "ClusterctlExecutor.InitOptions.CoreProvider is empty"} return phaseerrors.ErrInvalidPhase{Reason: "ClusterctlExecutor.InitOptions.CoreProvider is empty"}
} }
case airshipv1.Move: case airshipv1.Move:
if c.options.MoveOptions.Namespace == "" {
return phaseerrors.ErrInvalidPhase{Reason: "ClusterctlExecutor.MoveOptions.Namespace is empty"}
}
default: default:
return errors.ErrUnknownExecutorAction{Action: string(c.options.Action)} return errors.ErrUnknownExecutorAction{Action: string(c.options.Action)}
} }

11
pkg/phase/executors/clusterctl_test.go
View File

@ -234,11 +234,6 @@ func TestClusterctlExecutorValidate(t *testing.T) {
actionType: "init", actionType: "init",
executorConfigTmpl: executorConfigTmplGood, executorConfigTmpl: executorConfigTmplGood,
}, },
{
name: "Success move action",
actionType: "move",
executorConfigTmpl: executorConfigTmplGood,
},
{ {
name: "Error any other action", name: "Error any other action",
actionType: "any", actionType: "any",
@ -257,12 +252,6 @@ func TestClusterctlExecutorValidate(t *testing.T) {
executorConfigTmpl: executorConfigTmplBad, executorConfigTmpl: executorConfigTmplBad,
expectedErrString: "invalid phase: ClusterctlExecutor.InitOptions.CoreProvider is empty", expectedErrString: "invalid phase: ClusterctlExecutor.InitOptions.CoreProvider is empty",
}, },
{
name: "Error empty move option",
actionType: "move",
executorConfigTmpl: executorConfigTmplBad,
expectedErrString: "invalid phase: ClusterctlExecutor.MoveOptions.Namespace is empty",
},
} }
for _, test := range testCases { for _, test := range testCases {
tt := test tt := test