feat: add feature exception for search grader (#130)

* feat: add searchgrader category

* fix: export port

* feat: add feature exception for search grader

Author: bietkul

main.go

@@ -63,6 +63,8 @@ var (
 	FeatureFunctions string
 	// FeatureSearchRelevancy for testing
 	FeatureSearchRelevancy string
+	// FeatureSearchGrader for testing
+	FeatureSearchGrader string
 )
 
 func init() {
@@ -172,24 +174,29 @@ func main() {
 		}
 		util.SetTier(temp2.Tier)
 	}
-	if FeatureCustomEvents != "" && FeatureCustomEvents == "true" {
+	if FeatureCustomEvents == "true" {
 		util.SetFeatureCustomEvents(true)
 	}
-	if FeatureSuggestions != "" && FeatureSuggestions == "true" {
+	if FeatureSuggestions == "true" {
 		util.SetFeatureSuggestions(true)
 	}
-	if FeatureRules != "" && FeatureRules == "true" {
+	if FeatureRules == "true" {
 		util.SetFeatureRules(true)
 	}
-	if FeatureFunctions != "" && FeatureFunctions == "true" {
+	if FeatureFunctions == "true" {
 		util.SetFeatureFunctions(true)
 	}
-	if FeatureTemplates != "" && FeatureTemplates == "true" {
+	if FeatureTemplates == "true" {
 		util.SetFeatureTemplates(true)
 	}
-	if FeatureSearchRelevancy != "" && FeatureSearchRelevancy == "true" {
+	if FeatureSearchRelevancy == "true" {
 		util.SetFeatureSearchRelevancy(true)
 	}
+	if FeatureSearchGrader == "true" {
+		util.SetFeatureSearchGrader(true)
+	}
+	// Set port variable
+	util.Port = port
 
 	// ES client instantiation
 	// ES v7 and v6 clients

util/billing.go

@@ -70,6 +70,7 @@ type ClusterPlan struct {
 	FeatureTemplates       bool   `json:"feature_templates"`
 	FeatureFunctions       bool   `json:"feature_functions"`
 	FeatureSearchRelevancy bool   `json:"feature_search_relevancy"`
+	FeatureSearchGrader    bool   `json:"feature_search_grader"`
 	Trial                  bool   `json:"trial"`
 	TrialValidity          int64  `json:"trial_validity"`
 	TierValidity           int64  `json:"tier_validity"`
@@ -121,6 +122,7 @@ type ArcInstanceDetails struct {
 	FeatureTemplates       bool                   `json:"feature_templates"`
 	FeatureFunctions       bool                   `json:"feature_functions"`
 	FeatureSearchRelevancy bool                   `json:"feature_search_relevancy"`
+	FeatureSearchGrader    bool                   `json:"feature_search_grader"`
 }
 
 // SetDefaultTier sets the default tier when billing is disabled
@@ -206,6 +208,7 @@ func getArcInstance(arcID string) (ArcInstance, error) {
 		SetFeatureRules(arcInstanceByID.FeatureRules)
 		SetFeatureFunctions(arcInstanceByID.FeatureFunctions)
 		SetFeatureSearchRelevancy(arcInstanceByID.FeatureSearchRelevancy)
+		SetFeatureSearchGrader(arcInstanceByID.FeatureSearchGrader)
 		SetFeatureTemplates(arcInstanceByID.FeatureTemplates)
 	} else {
 		return arcInstance, errors.New("No valid instance found for the provided ARC_ID")
@@ -256,6 +259,7 @@ func getArcClusterInstance(clusterID string) (ArcInstance, error) {
 		SetFeatureRules(arcInstanceDetails.FeatureRules)
 		SetFeatureFunctions(arcInstanceDetails.FeatureFunctions)
 		SetFeatureSearchRelevancy(arcInstanceDetails.FeatureSearchRelevancy)
+		SetFeatureSearchGrader(arcInstanceDetails.FeatureSearchGrader)
 		SetFeatureTemplates(arcInstanceDetails.FeatureTemplates)
 	} else {
 		return arcInstance, errors.New("No valid instance found for the provided CLUSTER_ID")
@@ -304,6 +308,7 @@ func getClusterPlan(clusterID string) (ClusterPlan, error) {
 	SetFeatureRules(response.Plan.FeatureRules)
 	SetFeatureFunctions(response.Plan.FeatureFunctions)
 	SetFeatureSearchRelevancy(response.Plan.FeatureSearchRelevancy)
+	SetFeatureSearchGrader(response.Plan.FeatureSearchGrader)
 	SetFeatureTemplates(response.Plan.FeatureTemplates)
 
 	return clusterPlan, nil

util/billing_test.go

@@ -42,6 +42,10 @@ func TestBilling(t *testing.T) {
 			SetFeatureSearchRelevancy(true)
 			So(GetFeatureSearchRelevancy(), ShouldEqual, true)
 		})
+		Convey("Set FeatureSearchGrader", func() {
+			SetFeatureSearchGrader(true)
+			So(GetFeatureSearchGrader(), ShouldEqual, true)
+		})
 		Convey("Validate TimeValidity: Positive Value", func() {
 			// Set TimeValidity to a positive value
 			var timeValidityMock = 1200000

util/feature.go

@@ -77,3 +77,16 @@ func GetFeatureSearchRelevancy() bool {
 func SetFeatureSearchRelevancy(val bool) {
 	featureSearchRelevancy = val
 }
+
+// Feature search grader
+var featureSearchGrader bool
+
+// GetFeatureSearchGrader returns the featureSearchGrader
+func GetFeatureSearchGrader() bool {
+	return featureSearchGrader
+}
+
+// SetFeatureSearchGrader sets the featureSearchGrader
+func SetFeatureSearchGrader(val bool) {
+	featureSearchGrader = val
+}

util/util.go

@@ -34,6 +34,9 @@ var ClusterBilling string
 // Version arc version
 var Version string
 
+// Port arc port
+var Port int
+
 // RandStr returns "node" field of a UUID.
 // See: https://tools.ietf.org/html/rfc4122#section-4.1.6
 func RandStr() string {