Skip to content

Commit

Permalink
fixup! Revert "daniel nit"
Browse files Browse the repository at this point in the history
  • Loading branch information
elchead committed Jan 10, 2024
1 parent 412bc6f commit dc01a4a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
10 changes: 0 additions & 10 deletions internal/compatibility/compatibility.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,6 @@ func NextMinorVersion(version string) (string, error) {
return fmt.Sprintf("v%d.%d", major, minor+1), nil
}

// PriorMinorVersion returns the prior minor version for a given canonical semver.
// The returned format is vMAJOR.MINOR.
func PriorMinorVersion(version string) (string, error) {
major, minor, err := parseCanonicalSemver(EnsurePrefixV(version))
if err != nil {
return "", err
}
return fmt.Sprintf("v%d.%d", major, minor-1), nil
}

func parseCanonicalSemver(version string) (major int, minor int, err error) {
version = semver.MajorMinor(version) // ensure version is in canonical form (vX.Y.Z)
if version == "" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ go_test(
"//internal/attestation/idkeydigest",
"//internal/attestation/measurements",
"//internal/attestation/variant",
"//internal/compatibility",
"//internal/config",
"//internal/constants",
"//internal/semver",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/require"
)

var providerVersion string = "v0.0.0"
const providerVersion string = "v0.0.0"

func TestMicroserviceConstraint(t *testing.T) {
providerVersion := semver.NewFromInt(2, 15, 0, "")
Expand Down Expand Up @@ -469,7 +469,6 @@ func fullClusterTestingConfig(t *testing.T, csp string) string {
provider "constellation" {}
`


image := "v2.14.0"
switch csp {
case "aws":
Expand Down

0 comments on commit dc01a4a

Please sign in to comment.