jprdonnelly/steampipe
1
0
Fork 0
mirror of https://github.com/turbot/steampipe.git synced 2026-04-19 04:00:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated sdk version validation code

Browse Source
This commit is contained in:
kai
2021-06-10 10:52:54 +01:00
parent c8e46b29ca
commit 65997baee4
2 changed files with 0 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
steampipeconfig/connection_validation.go
View File

@@ -4,7 +4,6 @@ import (
"fmt"
"strings"
"github.com/hashicorp/go-version"
"github.com/turbot/go-kit/helpers"
sdkversion "github.com/turbot/steampipe-plugin-sdk/version"
"github.com/turbot/steampipe/constants"
@@ -110,11 +109,3 @@ func validateColumnDefVersion(p *ConnectionPlugin) *ValidationFailure {
}
return nil
}
// return false if pluginSdkVersion is > steampipeSdkVersion, ignoring prerelease
func validateIgnoringPrerelease(pluginSdkVersion *version.Version, steampipeSdkVersion *version.Version) bool {
pluginSegments := pluginSdkVersion.Segments()
steampipeSegments := steampipeSdkVersion.Segments()
return pluginSegments[0] <= steampipeSegments[0] && pluginSegments[1] <= steampipeSegments[1]
}

87
steampipeconfig/connection_validation_test.go
View File

@@ -1,87 +0,0 @@
package steampipeconfig
import (
"testing"
"github.com/hashicorp/go-version"
)
type validateSdkVersionTest struct {
pluginSdkVersion string
steampipeSdkVersion string
expected bool
}
var validateSdkVersionTestCases = map[string]validateSdkVersionTest{
"same": {
pluginSdkVersion: "1.0.0",
steampipeSdkVersion: "1.0.0",
expected: true,
},
"same, short version": {
pluginSdkVersion: "1.0",
steampipeSdkVersion: "1.0.0",
expected: true,
},
"same, shorter version": {
pluginSdkVersion: "1",
steampipeSdkVersion: "1.0",
expected: true,
},
"plugin higher prerelease": {
pluginSdkVersion: "1.0.0-beta.1",
steampipeSdkVersion: "1.0",
expected: true,
},
"same prerelease": {
pluginSdkVersion: "1.0.0-beta.1",
steampipeSdkVersion: "1.0.0-beta.1",
expected: true,
},
"steampipe short, same prerelease": {
pluginSdkVersion: "1.0.0-beta.1",
steampipeSdkVersion: "1-beta.1",
expected: true,
},
"diff prerelease": {
pluginSdkVersion: "1.0.0-beta.1",
steampipeSdkVersion: "1.0.0-rc.1",
expected: true,
},
"plugin higher major FAILS": {
pluginSdkVersion: "2.0.0",
steampipeSdkVersion: "1.0.0",
expected: false,
},
"plugin higher minor FAILS": {
pluginSdkVersion: "1.1.0",
steampipeSdkVersion: "1.0.0",
expected: false,
},
"plugin higher patch": {
pluginSdkVersion: "1.0.1",
steampipeSdkVersion: "1.0.0",
expected: true,
},
"plugin higher major steampipe prerelease FAILS": {
pluginSdkVersion: "2.0.0",
steampipeSdkVersion: "1.0.0-beta.1",
expected: false,
},
"plugin higher minor steampipe prerelease FAILS": {
pluginSdkVersion: "1.1.0",
steampipeSdkVersion: "1.0.0-beta-1",
expected: false,
},
}
func TestValidateSdkVersion(t *testing.T) {
for name, test := range validateSdkVersionTestCases {
pluginSdkVersion, _ := version.NewSemver(test.pluginSdkVersion)
steampipeSdkVersion, _ := version.NewSemver(test.steampipeSdkVersion)
if isValid := validateIgnoringPrerelease(pluginSdkVersion, steampipeSdkVersion); isValid != test.expected {
t.Errorf("Test '%s' expected %v but got %v", name, test.expected, isValid)
}
}
}