Merge pull request #40 from appbaseio/fix/cluster-plan-test

fix: segmentation error + apply billing middleware for appbase.io clusters and hosted Arc

Author: lakhansamani

main.go

@@ -110,13 +110,15 @@ func main() {
 		cronjob := cron.New()
 		cronjob.AddFunc(interval, util.ReportHostedArcUsage)
 		cronjob.Start()
+		router.Use(util.BillingMiddleware)
 	} else if ClusterBilling == "true" {
 		log.Println("You're running Arc with cluster billing module enabled.")
 		util.SetClusterPlan()
 		// refresh plan
 		cronjob := cron.New()
 		cronjob.AddFunc(interval, util.SetClusterPlan)
 		cronjob.Start()
+		router.Use(util.BillingMiddleware)
 	} else {
 		log.Println("You're running Arc with billing module disabled.")
 	}

middleware/validate/plan.go

@@ -19,7 +19,10 @@ func Plan(validPlans []util.Plan, byPassValidation bool) middleware.Middleware {
 // Throws the payment required error
 func invalidPlan(h http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
-		msg := "This feature is not available for the " + util.Tier.String() + " plan users."
+		msg := "This feature is not available for the free plan users, please upgrade to a paid plan."
+		if util.Tier != nil {
+			msg = "This feature is not available for the " + util.Tier.String() + " plan users, please upgrade to a higher plan."
+		}
 		util.WriteBackError(w, msg, http.StatusPaymentRequired)
 	}
 }

util/billing.go

@@ -46,9 +46,14 @@ type ArcUsage struct {
 }
 
 type ClusterPlan struct {
-	Tier                *Plan `json:"pricing_plan"`
-	FeatureCustomEvents bool  `json:"feature_custom_events"`
-	FeatureSuggestions  bool  `json:"feature_suggestions"`
+	Tier                *Plan  `json:"tier"`
+	FeatureCustomEvents bool   `json:"feature_custom_events"`
+	FeatureSuggestions  bool   `json:"feature_suggestions"`
+	Trial               bool   `json:"trial"`
+	TrialValidity       int64  `json:"trial_validity"`
+	TierValidity        int64  `json:"tier_validity"`
+	TimeValidity        int64  `json:"time_validity"`
+	SubscriptionID      string `json:"subscription_id"`
 }
 
 // ArcUsageResponse stores the response from ACCAPI
@@ -231,13 +236,14 @@ func getClusterPlan(clusterID string) (ClusterPlan, error) {
 	}
 	// Set the plan for clusters
 	Tier = response.Plan.Tier
+	TimeValidity = response.Plan.TimeValidity
 	FeatureCustomEvents = response.Plan.FeatureCustomEvents
 	FeatureSuggestions = response.Plan.FeatureSuggestions
 
 	return clusterPlan, nil
 }
 
-// GetClusterPlan fetches the cluster plan & sets the Tier value
+// SetClusterPlan fetches the cluster plan & sets the Tier value
 func SetClusterPlan() {
 	log.Printf("=> Getting cluster plan details")
 	clusterID := os.Getenv("CLUSTER_ID")
@@ -247,7 +253,7 @@ func SetClusterPlan() {
 	}
 	_, err := getClusterPlan(clusterID)
 	if err != nil {
-		log.Println("Unable to fetch the cluster plan. Please make sure that you're using a valid CLUSTER_ID.", err)
+		log.Fatalln("Unable to fetch the cluster plan. Please make sure that you're using a valid CLUSTER_ID. If the issue persists please contact support@appbase.io with your ARC_ID or registered e-mail address.", err)
 		return
 	}
 }
@@ -333,7 +339,7 @@ func ReportUsage() {
 
 	result, err := getArcInstance(arcID)
 	if err != nil {
-		log.Println("Unable to fetch the arc instance. Please make sure that you're using a valid ARC_ID.")
+		log.Fatalln("Unable to fetch the arc instance. Please make sure that you're using a valid ARC_ID. If the issue persists please contact support@appbase.io with your ARC_ID or registered e-mail address.")
 		return
 	}
 
@@ -383,7 +389,7 @@ func ReportHostedArcUsage() {
 	// getArcClusterInstance(clusterId)
 	result, err := getArcClusterInstance(clusterID)
 	if err != nil {
-		log.Println("Unable to fetch the arc instance. Please make sure that you're using a valid CLUSTER_ID.", err)
+		log.Fatalln("Unable to fetch the arc instance. Please make sure that you're using a valid CLUSTER_ID. If the issue persists please contact support@appbase.io with your ARC_ID or registered e-mail address.", err)
 		return
 	}
 

util/plans.go

@@ -154,6 +154,9 @@ func ValidatePlans(validPlans []Plan, byPassValidation bool) bool {
 	if byPassValidation {
 		return true
 	}
+	if Tier == nil {
+		return false
+	}
 	for _, validPlan := range validPlans {
 		if (ClusterBilling == "true" || Billing == "true" || HostedBilling == "true") && Tier.String() == validPlan.String() {
 			return true