Refactor error handling (#291)

Author: onematchfox

argocd/features_test.go

@@ -5,10 +5,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Masterminds/semver"
+	"github.com/Masterminds/semver/v3"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/oboukili/terraform-provider-argocd/internal/features"
 )
 
 var testAccProviders map[string]func() (*schema.Provider, error)
@@ -68,7 +69,7 @@ func testAccPreCheck(t *testing.T) {
 }
 
 // Skip test if feature is not supported
-func testAccPreCheckFeatureSupported(t *testing.T, feature int) {
+func testAccPreCheckFeatureSupported(t *testing.T, feature features.Feature) {
 	v := os.Getenv("ARGOCD_VERSION")
 	if v == "" {
 		t.Skip("ARGOCD_VERSION must be set set for feature supported acceptance tests")
@@ -79,34 +80,35 @@ func testAccPreCheckFeatureSupported(t *testing.T, feature int) {
 		t.Fatalf("could not parse ARGOCD_VERSION as semantic version: %s", v)
 	}
 
-	versionConstraint, ok := featureVersionConstraintsMap[feature]
+	fc, ok := features.ConstraintsMap[feature]
 	if !ok {
 		t.Fatal("feature constraint is not handled by the provider")
 	}
 
-	if i := versionConstraint.Compare(serverVersion); i == 1 {
+	if i := fc.MinVersion.Compare(serverVersion); i == 1 {
 		t.Skipf("version %s does not support feature", v)
 	}
 }
 
 // Skip test if feature is supported
-func testAccPreCheckFeatureNotSupported(t *testing.T, feature int) {
-	v := os.Getenv("ARGOCD_VERSION")
-	if v == "" {
-		t.Skip("ARGOCD_VERSION must be set set for feature supported acceptance tests")
-	}
-
-	serverVersion, err := semver.NewVersion(v)
-	if err != nil {
-		t.Fatalf("could not parse ARGOCD_VERSION as semantic version: %s", v)
-	}
-
-	versionConstraint, ok := featureVersionConstraintsMap[feature]
-	if !ok {
-		t.Fatal("feature constraint is not handled by the provider")
-	}
-
-	if i := versionConstraint.Compare(serverVersion); i != 1 {
-		t.Skipf("not running test if feature is already supported (%s)", v)
-	}
-}
+// Note: unused at present but left in the code in case it is needed again in future
+// func testAccPreCheckFeatureNotSupported(t *testing.T, feature int) {
+// 	v := os.Getenv("ARGOCD_VERSION")
+// 	if v == "" {
+// 		t.Skip("ARGOCD_VERSION must be set set for feature supported acceptance tests")
+// 	}
+
+// 	serverVersion, err := semver.NewVersion(v)
+// 	if err != nil {
+// 		t.Fatalf("could not parse ARGOCD_VERSION as semantic version: %s", v)
+// 	}
+
+// 	versionConstraint, ok := featureVersionConstraintsMap[feature]
+// 	if !ok {
+// 		t.Fatal("feature constraint is not handled by the provider")
+// 	}
+
+// 	if i := versionConstraint.Compare(serverVersion); i != 1 {
+// 		t.Skipf("not running test if feature is already supported (%s)", v)
+// 	}
+// }