mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-09-20 13:04:36 -04:00
cli: fail fast when CLI and Constellation versions don't match (#1972)
* fail on version mismatch * rename to validateCLIandConstellationVersionAreEqual * fix test * image version must only be major,minor patch equal (ignore suffix) * add version support doc * fix: do not check patch version equality for image and cli * skip validate on force
This commit is contained in:
parent
90ffcd17e8
commit
1edbe962c1
6 changed files with 140 additions and 2 deletions
|
@ -14,11 +14,13 @@ import (
|
|||
"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
|
||||
"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
|
||||
"github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi"
|
||||
"github.com/edgelesssys/constellation/v2/internal/api/versionsapi"
|
||||
"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
|
||||
"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
|
||||
"github.com/edgelesssys/constellation/v2/internal/config"
|
||||
"github.com/edgelesssys/constellation/v2/internal/constants"
|
||||
"github.com/edgelesssys/constellation/v2/internal/file"
|
||||
"github.com/edgelesssys/constellation/v2/internal/semver"
|
||||
"github.com/spf13/afero"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
@ -83,6 +85,11 @@ func (c *createCmd) create(cmd *cobra.Command, creator cloudCreator, fileHandler
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !flags.force {
|
||||
if err := validateCLIandConstellationVersionAreEqual(constants.VersionInfo(), conf.Image, conf.MicroserviceVersion); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
c.log.Debugf("Checking configuration for warnings")
|
||||
var printedAWarning bool
|
||||
|
@ -292,3 +299,34 @@ func must(err error) {
|
|||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
// validateCLIandConstellationVersionAreEqual checks if the image and microservice version are equal (down to patch level) to the CLI version.
|
||||
func validateCLIandConstellationVersionAreEqual(cliVersion, imageVersion, microserviceVersion string) error {
|
||||
parsedImageVersion, err := versionsapi.NewVersionFromShortPath(imageVersion, versionsapi.VersionKindImage)
|
||||
if err != nil {
|
||||
return fmt.Errorf("parsing image version: %w", err)
|
||||
}
|
||||
|
||||
semImage, err := semver.New(parsedImageVersion.Version)
|
||||
if err != nil {
|
||||
return fmt.Errorf("parsing image semantical version: %w", err)
|
||||
}
|
||||
|
||||
semMicro, err := semver.New(microserviceVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("parsing microservice version: %w", err)
|
||||
}
|
||||
|
||||
semCLI, err := semver.New(cliVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("parsing binary version: %w", err)
|
||||
}
|
||||
|
||||
if !semCLI.MajorMinorEqual(semImage) {
|
||||
return fmt.Errorf("image version %q does not match the major and minor version of the cli version %q", semImage.String(), semCLI.String())
|
||||
}
|
||||
if semCLI.Compare(semMicro) != 0 {
|
||||
return fmt.Errorf("cli version %q does not match microservice version %q", semCLI.String(), semMicro.String())
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -270,6 +270,73 @@ func TestCheckDirClean(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestValidateCLIandConstellationVersionCompatibility(t *testing.T) {
|
||||
testCases := map[string]struct {
|
||||
imageVersion string
|
||||
microServiceVersion string
|
||||
cliVersion string
|
||||
wantErr bool
|
||||
}{
|
||||
"empty": {
|
||||
imageVersion: "",
|
||||
microServiceVersion: "",
|
||||
cliVersion: "",
|
||||
wantErr: true,
|
||||
},
|
||||
"invalid when image < CLI": {
|
||||
imageVersion: "v2.7.1",
|
||||
microServiceVersion: "v2.8.0",
|
||||
cliVersion: "v2.8.0",
|
||||
wantErr: true,
|
||||
},
|
||||
"invalid when microservice < CLI": {
|
||||
imageVersion: "v2.8.0",
|
||||
microServiceVersion: "v2.7.1",
|
||||
cliVersion: "v2.8.0",
|
||||
wantErr: true,
|
||||
},
|
||||
"valid release version": {
|
||||
imageVersion: "v2.9.0",
|
||||
microServiceVersion: "v2.9.0",
|
||||
cliVersion: "2.9.0",
|
||||
},
|
||||
"valid pre-version": {
|
||||
imageVersion: "ref/main/stream/nightly/v2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
microServiceVersion: "v2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
cliVersion: "2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
},
|
||||
"image version suffix need not be equal to CLI version": {
|
||||
imageVersion: "ref/main/stream/nightly/v2.9.0-pre.0.19990626150512-9z36ce61799z",
|
||||
microServiceVersion: "v2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
cliVersion: "2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
},
|
||||
"image version can have different patch version": {
|
||||
imageVersion: "ref/main/stream/nightly/v2.9.1-pre.0.19990626150512-9z36ce61799z",
|
||||
microServiceVersion: "v2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
cliVersion: "2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
},
|
||||
"microService version suffix must be equal to CLI version": {
|
||||
imageVersion: "ref/main/stream/nightly/v2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
microServiceVersion: "v2.9.0-pre.0.19990626150512-9z36ce61799z",
|
||||
cliVersion: "2.9.0-pre.0.20230626150512-0a36ce61719f",
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
for name, tc := range testCases {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
assert := assert.New(t)
|
||||
|
||||
err := validateCLIandConstellationVersionAreEqual(tc.cliVersion, tc.imageVersion, tc.microServiceVersion)
|
||||
|
||||
if tc.wantErr {
|
||||
assert.Error(err)
|
||||
} else {
|
||||
assert.NoError(err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func intPtr(i int) *int {
|
||||
return &i
|
||||
}
|
||||
|
|
|
@ -121,7 +121,11 @@ func (i *initCmd) initialize(cmd *cobra.Command, newDialer func(validator atls.V
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !flags.force {
|
||||
if err := validateCLIandConstellationVersionAreEqual(constants.VersionInfo(), conf.Image, conf.MicroserviceVersion); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if conf.GetAttestationConfig().GetVariant().Equal(variant.AWSSEVSNP{}) {
|
||||
cmd.PrintErrln("WARNING: SNP based attestation is still under active development. Please do not use in production.")
|
||||
}
|
||||
|
|
|
@ -494,7 +494,7 @@ func TestAttestation(t *testing.T) {
|
|||
require.NoError(fileHandler.WriteJSON(constants.ClusterIDsFileName, existingIDFile, file.OptNone))
|
||||
|
||||
cfg := config.Default()
|
||||
cfg.Image = "image"
|
||||
cfg.Image = "v0.0.0" // is the default version of the the CLI (before build injects the real version)
|
||||
cfg.RemoveProviderAndAttestationExcept(cloudprovider.QEMU)
|
||||
cfg.Attestation.QEMUVTPM.Measurements[0] = measurements.WithAllBytes(0x00, measurements.Enforce, measurements.PCRMeasurementLength)
|
||||
cfg.Attestation.QEMUVTPM.Measurements[1] = measurements.WithAllBytes(0x11, measurements.Enforce, measurements.PCRMeasurementLength)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue