fix(billing): hosted arc (#41)

* fix: arc_hosted billing

* fix: serious billing issue with time_validity

* feat: add ingnoreBillingMiddleware flag

* fix: revert acc_api

* fix: minor fixes

* fix: minor changes

Author: bietkul

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}"

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,22 +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()
-		router.Use(util.BillingMiddleware)
+		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()
-		router.Use(util.BillingMiddleware)
+		if IgnoreBillingMiddleware != "true" {
+			router.Use(util.BillingMiddleware)
+		}
 	} else {
 		log.Println("You're running Arc with billing module disabled.")
 	}

util/billing.go

@@ -105,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)
@@ -192,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")
 	}