Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-09 07:22:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

consistently use stdout and stderr (#502)

Browse source 
* consistently use stdout and stderr
Signed-off-by: Fabian Kammel <fk@edgeless.systems>
This commit is contained in:
Fabian Kammel 2022-11-10 10:27:24 +01:00
parent 6702b25758
commit 889a6b1893
Failed to extract signature
14 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli/internal/cloudcmd/upgrade.go
View file

@ -29,11 +29,11 @@ type Upgrader struct {
measurementsUpdater measurementsUpdater
imageUpdater imageUpdater
writer io.Writer
outWriter io.Writer
}
// NewUpgrader returns a new Upgrader.
func NewUpgrader(writer io.Writer) (*Upgrader, error) {
func NewUpgrader(outWriter io.Writer) (*Upgrader, error) {
kubeConfig, err := clientcmd.BuildConfigFromFlags("", constants.AdminConfFilename)
if err != nil {
return nil, fmt.Errorf("building kubernetes config: %w", err)
@ -53,7 +53,7 @@ func NewUpgrader(writer io.Writer) (*Upgrader, error) {
return &Upgrader{
measurementsUpdater: &kubeMeasurementsUpdater{client: kubeClient},
imageUpdater: &kubeImageUpdater{client: unstructuredClient},
writer: writer,
outWriter: outWriter,
}, nil
}
@ -118,7 +118,7 @@ func (u *Upgrader) updateMeasurements(ctx context.Context, measurements map[uint
}
if !changed {
// measurements are the same, nothing to be done
fmt.Fprintln(u.writer, "Cluster is already using the chosen measurements, skipping measurements upgrade")
fmt.Fprintln(u.outWriter, "Cluster is already using the chosen measurements, skipping measurements upgrade")
return nil
}
}
@ -136,7 +136,7 @@ func (u *Upgrader) updateMeasurements(ctx context.Context, measurements map[uint
return fmt.Errorf("setting new measurements: %w", err)
}
fmt.Fprintln(u.writer, "Successfully updated the cluster's expected measurements")
fmt.Fprintln(u.outWriter, "Successfully updated the cluster's expected measurements")
return nil
}
@ -147,7 +147,7 @@ func (u *Upgrader) updateImage(ctx context.Context, image string) error {
}
if currentImageDefinition == image {
fmt.Fprintln(u.writer, "Cluster is already using the chosen image, skipping image upgrade")
fmt.Fprintln(u.outWriter, "Cluster is already using the chosen image, skipping image upgrade")
return nil
}
@ -156,7 +156,7 @@ func (u *Upgrader) updateImage(ctx context.Context, image string) error {
return fmt.Errorf("setting new image: %w", err)
}
fmt.Fprintln(u.writer, "Successfully updated the cluster's image, upgrades will be applied automatically")
fmt.Fprintln(u.outWriter, "Successfully updated the cluster's image, upgrades will be applied automatically")
return nil
}