a6363f1c1e
We perform almost the same activities prior calling createBootstrapIso function like we do that in phase executor, also image build command now is techically outdated since it doesn't work because it fails with "phase document was not found" error. This patch removes unnecessary functions like GenerateBootstrapIso and runs image build command in a phase way. Test coverage increases slightly (by 0.2%) by removing partially duplicating code which was not tested properly. Minor bug fixes included. Change-Id: I545004cea721164838b296ae647a7651cde248ff Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
87 lines
1.8 KiB
Go
87 lines
1.8 KiB
Go
/*
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
https://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package phase
|
|
|
|
import (
|
|
"io"
|
|
"time"
|
|
|
|
"opendev.org/airship/airshipctl/pkg/config"
|
|
"opendev.org/airship/airshipctl/pkg/phase/ifc"
|
|
)
|
|
|
|
// RunFlags options for phase run command
|
|
type RunFlags struct {
|
|
DryRun bool
|
|
Timeout time.Duration
|
|
PhaseID ifc.ID
|
|
Kubeconfig string
|
|
Progress bool
|
|
}
|
|
|
|
// RunCommand phase run command
|
|
type RunCommand struct {
|
|
Options RunFlags
|
|
Factory config.Factory
|
|
}
|
|
|
|
// RunE runs the phase
|
|
func (c *RunCommand) RunE() error {
|
|
cfg, err := c.Factory()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
helper, err := NewHelper(cfg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
kubeconfigOption := InjectKubeconfigPath(c.Options.Kubeconfig)
|
|
client := NewClient(helper, kubeconfigOption)
|
|
|
|
phase, err := client.PhaseByID(c.Options.PhaseID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return phase.Run(ifc.RunOptions{DryRun: c.Options.DryRun, Timeout: c.Options.Timeout, Progress: c.Options.Progress})
|
|
}
|
|
|
|
// PlanCommand plan command
|
|
type PlanCommand struct {
|
|
Factory config.Factory
|
|
Writer io.Writer
|
|
}
|
|
|
|
// RunE runs a phase plan command
|
|
func (c *PlanCommand) RunE() error {
|
|
cfg, err := c.Factory()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
helper, err := NewHelper(cfg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
plan, err := helper.Plan()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return PrintPlan(plan, c.Writer)
|
|
}
|