Merge branch 'feat/es7' of github.com:appbaseio/arc into feat/es7

Author: bietkul

.gitignore

@@ -6,3 +6,5 @@ build
 *.http
 
 tags
+
+config

Dockerfile

@@ -13,6 +13,10 @@ ENV HOSTED_BILLING="${HOSTED_BILLING}"
 ARG CLUSTER_BILLING=false
 ENV CLUSTER_BILLING="${CLUSTER_BILLING}"
 
+# Run `--build-arg IGNORE_BILLING_MIDDLEWARE=true` to disable billing middleware for testing
+ARG IGNORE_BILLING_MIDDLEWARE=false
+ENV IGNORE_BILLING_MIDDLEWARE="${IGNORE_BILLING_MIDDLEWARE}"
+
 # Run `--build-arg PLAN_REFRESH_INTERVAL=X` to change the default interval of 1 hour, where 'X' is an integer represent the hours unit
 ARG PLAN_REFRESH_INTERVAL=1
 ENV PLAN_REFRESH_INTERVAL="${PLAN_REFRESH_INTERVAL}"
@@ -36,9 +40,17 @@ RUN make
 # Final stage: Create the running container
 FROM alpine:3.10.1 AS final
 
+# Get ca certs, for making api calls
+RUN apk add --no-cache ca-certificates
+
+
+# Create env folder
+RUN mkdir /arc-data && touch /arc-data/.env && chmod 777 /arc-data/.env
+
 # Import the compiled executable from the first stage.
 COPY --from=builder /arc /arc
 WORKDIR /arc
 
 EXPOSE 8000
-CMD ["build/arc", "--log", "stdout", "--plugins"]
+ENTRYPOINT ["build/arc", "--log", "stdout", "--plugins"]
+CMD ["--env", "config/docker.env"]

Makefile

@@ -9,7 +9,7 @@ PLUGIN_MAIN_LOC_FUNC=plugins/$(1)/main/$(1).$(2)
 PLUGIN_LOC_FUNC=$(foreach PLUGIN,$(PLUGINS),$(call PLUGIN_MAIN_LOC_FUNC,$(PLUGIN),$(1)))
 
 cmd: plugins
-	$(GC) -ldflags "-X main.Billing=$(BILLING) -X main.HostedBilling=$(HOSTED_BILLING) -X main.ClusterBilling=$(CLUSTER_BILLING) -X main.PlanRefreshInterval=$(PLAN_REFRESH_INTERVAL)" -o $(BUILD_DIR)/arc main.go
+	$(GC) -ldflags "-X main.Billing=$(BILLING) -X main.HostedBilling=$(HOSTED_BILLING) -X main.ClusterBilling=$(CLUSTER_BILLING) -X main.PlanRefreshInterval=$(PLAN_REFRESH_INTERVAL) -X main.IgnoreBillingMiddleware=$(IGNORE_BILLING_MIDDLEWARE)" -o $(BUILD_DIR)/arc main.go
 
 plugins: $(call PLUGIN_LOC_FUNC,so)
 

main.go

@@ -43,6 +43,8 @@ var (
 	HostedBilling string
 	// ClusterBilling is a build time flag
 	ClusterBilling string
+	// IgnoreBillingMiddleware ignores the billing middleware
+	IgnoreBillingMiddleware string
 )
 
 func init() {
@@ -103,20 +105,28 @@ func main() {
 		cronjob := cron.New()
 		cronjob.AddFunc(interval, util.ReportUsage)
 		cronjob.Start()
-		router.Use(util.BillingMiddleware)
+		if IgnoreBillingMiddleware != "true" {
+			router.Use(util.BillingMiddleware)
+		}
 	} else if HostedBilling == "true" {
 		log.Println("You're running Arc with hosted billing module enabled.")
 		util.ReportHostedArcUsage()
 		cronjob := cron.New()
 		cronjob.AddFunc(interval, util.ReportHostedArcUsage)
 		cronjob.Start()
+		if IgnoreBillingMiddleware != "true" {
+			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()
+		if IgnoreBillingMiddleware != "true" {
+			router.Use(util.BillingMiddleware)
+		}
 	} else {
 		var plan = util.ArcEnterprise
 		util.Tier = &plan

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
@@ -100,7 +105,7 @@ func BillingMiddleware(next http.Handler) http.Handler {
 		log.Println("current time validity value: ", TimeValidity)
 		if TimeValidity > 0 { // Valid plan
 			next.ServeHTTP(w, r)
-		} else if TimeValidity <= 0 && TimeValidity < -3600*MaxErrorTime { // Negative validity, plan has been expired
+		} else if TimeValidity <= 0 && -TimeValidity < 3600*MaxErrorTime { // Negative validity, plan has been expired
 			// Print warning message if remaining time is less than max allowed time
 			log.Println("Warning: Payment is required. Arc will start sending out error messages in next", MaxErrorTime, "hours")
 			next.ServeHTTP(w, r)
@@ -187,12 +192,12 @@ func getArcClusterInstance(clusterID string) (ArcInstance, error) {
 		return arcInstance, err
 	}
 	if len(response.ArcInstances) != 0 {
-		arcInstanceByID := getArcInstanceByID(clusterID, response.ArcInstances)
-		arcInstance.SubscriptionID = arcInstanceByID.SubscriptionID
-		TimeValidity = arcInstanceByID.TimeValidity
-		Tier = arcInstanceByID.Tier
-		FeatureCustomEvents = arcInstanceByID.FeatureCustomEvents
-		FeatureSuggestions = arcInstanceByID.FeatureSuggestions
+		arcInstanceDetails := response.ArcInstances[0]
+		arcInstance.SubscriptionID = arcInstanceDetails.SubscriptionID
+		TimeValidity = arcInstanceDetails.TimeValidity
+		Tier = arcInstanceDetails.Tier
+		FeatureCustomEvents = arcInstanceDetails.FeatureCustomEvents
+		FeatureSuggestions = arcInstanceDetails.FeatureSuggestions
 	} else {
 		return arcInstance, errors.New("No valid instance found for the provided CLUSTER_ID")
 	}
@@ -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