appbaseio
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Dockerfile‎
Lines changed: 39 additions & 5 deletions b/‎Dockerfile‎
Lines changed: 39 additions & 5 deletions
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 13 additions & 13 deletions b/‎README.md‎
Lines changed: 13 additions & 13 deletions
diff --git a/‎config/manual-http-jwt.env‎
Lines changed: 0 additions & 1 deletion b/‎config/manual-http-jwt.env‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎docker-compose.yml‎
Lines changed: 1 addition & 1 deletion b/‎docker-compose.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎go.mod‎
Lines changed: 9 additions & 8 deletions b/‎go.mod‎
Lines changed: 9 additions & 8 deletions
@@ -6,3 +6,5 @@ build
 *.http
 
 tags
+
+config
@@ -1,21 +1,55 @@
-FROM golang:1.11-alpine as build
+FROM golang:1.13-alpine as builder
+
+# Default value
+# Run `--build-arg BILLING=true` to enable billing
+ARG BILLING=false
+ENV BILLING="${BILLING}"
+
+# Run `--build-arg HOSTED_BILLING=true` to enable billing for hosted arc
+ARG HOSTED_BILLING=false
+ENV HOSTED_BILLING="${HOSTED_BILLING}"
+
+# Run `--build-arg CLUSTER_BILLING=true` to enable billing for clusters
+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}"
 
 # Install tools required for project
 # Run `docker build --no-cache .` to update dependencies
 RUN apk add --no-cache build-base git
 WORKDIR /arc
 
 # List project dependencies with go.mod and go.sum
-COPY go.mod .
-COPY go.sum .
+COPY go.mod go.sum ./
 
 # Install library dependencies
-RUN go mod download 
+RUN go mod download
 
 # Copy the entire project and build it
 # This layer is rebuilt when a file changes in the project directory
 COPY . .
 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"]
@@ -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) -o $(BUILD_DIR)/arc main.go
+	$(GC) -ldflags "-w -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)
 
 
@@ -1,6 +1,6 @@
 # Arc
 
-Arc is a simple, modular API Gateway that sits between a client and an [ElasticSearch](https://elastic.co) cluster. It acts as a reverse proxy, routing requests from clients to services. Arc is extended through plugins, which provide extra functionality and services beyond the ElasticSearch's RESTful API. It can perform various cross-cutting tasks such as basic authentication, logging, rate-limiting, source/referers whitelisting, analytics etc. These functionalities can clearly be extended by adding a plugin encapsulating a desired  functionality. It also provides some useful abstractions that helps in managing and controlling the access 
+Arc is a simple, modular API Gateway that sits between a client and an [ElasticSearch](https://elastic.co) cluster. It acts as a reverse proxy, routing requests from clients to services. Arc is extended through plugins, which provide extra functionality and services beyond the ElasticSearch's RESTful API. It can perform various cross-cutting tasks such as basic authentication, logging, rate-limiting, source/referers whitelisting, analytics etc. These functionalities can clearly be extended by adding a plugin encapsulating a desired  functionality. It also provides some useful abstractions that helps in managing and controlling the access
 to ElasticSearch's RESTful API.
 
 ## Table of contents
@@ -14,10 +14,10 @@ to ElasticSearch's RESTful API.
 
 ## Overview
 
-When Arc is deployed, every client request being made to the Elasticsearch 
-will hit Arc first and then be proxied to the Elasticsearch cluster. In between requests and responses, Arc 
-may execute the installed plugins, essentially extending the Elasticsearch API feature set. Arc effectively 
-becomes an entry point for every API request made to Elasticsearch. Arc can be used and deployed against any 
+When Arc is deployed, every client request being made to the Elasticsearch
+will hit Arc first and then be proxied to the Elasticsearch cluster. In between requests and responses, Arc
+may execute the installed plugins, essentially extending the Elasticsearch API feature set. Arc effectively
+becomes an entry point for every API request made to Elasticsearch. Arc can be used and deployed against any
 Elasticsearch cluster (locally and hosted as provided by [Appbase.io](https://appbase.io)).
 
 ```
@@ -60,12 +60,12 @@ In order to run arc, you'll require an Elasticsearch node. There are multiple wa
 
 2. Start a single node Elasticsearch cluster locally
 
-        docker run -d --rm --name elasticsearch -p 9200:9200 -p 9300:9300 --net=arc -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.0
+        docker run -d --rm --name elasticsearch -p 9200:9200 -p 9300:9300 --net=arc -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch-oss:7.2.0
 
 3. Start Arc locally
 
         docker build -t arc . && docker run --rm --name arc -p 8000:8000 --net=arc --env-file=config/docker.env arc
-  
+
 For convenience, the steps described above are combined into a single `docker-compose` file. You can execute the file with command:
 
     docker-compose up
@@ -172,16 +172,16 @@ A `User` grants a `Permission` to a certain `User`, predefining its capabilities
 
 #### Category
 
-Categories can be used to control access to data and APIs in Arc. Along with Elasticsearch APIs, Categories cover the APIs provided by Arc itself to allow fine-grained control over the API consumption. For Elasticsearch, Categories broadly resembles to the API [classification](https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html) that Elasticsearch 
-provides such as **Document APIs**, **Search APIs**, **Indices APIs** and so on. For Arc, Categories resembles to the 
+Categories can be used to control access to data and APIs in Arc. Along with Elasticsearch APIs, Categories cover the APIs provided by Arc itself to allow fine-grained control over the API consumption. For Elasticsearch, Categories broadly resembles to the API [classification](https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html) that Elasticsearch
+provides such as **Document APIs**, **Search APIs**, **Indices APIs** and so on. For Arc, Categories resembles to the
 additional APIs on top of Elasticsearch APIs, such as analytics and book keeping. Refer to category [docs](https://github.com/appbaseio/arc/blob/ugo/update-readme/31-12-2018/docs/categories.md) for the list of
 categories that Arc supports.
 
 #### ACL
 
 ACLs allow a fine grained control over the Elasticsearch APIs in addition to the Categories. Each ACL resembles an
-action performed by an Elasticsearch API. For brevity, setting and organising Categories automatically sets the default 
-ACLs associated with the set Categories. Setting ACLs adds just another level of control to provide access to 
+action performed by an Elasticsearch API. For brevity, setting and organising Categories automatically sets the default
+ACLs associated with the set Categories. Setting ACLs adds just another level of control to provide access to
 Elasticsearch APIs within a given Category. Refer to acl [docs](https://github.com/appbaseio/arc/blob/ugo/update-readme/31-12-2018/docs/acls.md) for the list of acls that Arc supports.
 
 #### Op
@@ -194,8 +194,8 @@ of the plugin. Operation is currently classified into three kinds:
 - `Write`: operation permits write requests exclusively.
 - `Delete`: operation permits delete requests exclusively.
 
-In order to allow a user or permission to make requests that involve modifying the data, a combination of the above 
-operations would be required. For example: `["read", "write"]` operation would allow a user or permission to perform 
+In order to allow a user or permission to make requests that involve modifying the data, a combination of the above
+operations would be required. For example: `["read", "write"]` operation would allow a user or permission to perform
 both read and write requests but would forbid making delete requests.
 
 #### Request Logging
 
@@ -3,7 +3,6 @@ ES_CLUSTER_URL=http://127.0.0.1:9200
 USERNAME=foo
 PASSWORD=bar
 
-JWT_RSA_PUBLIC_KEY_DEST=http://localhost:8500/rsa-public
 HTTPS_CERT=sample/server.crt
 HTTPS_KEY=sample/server.key
 JWT_ROLE_KEY=role
@@ -1,7 +1,7 @@
 version: '3'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.0
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.2.0
     container_name: elasticsearch
     networks:
       - arc
 
@@ -2,21 +2,22 @@ module github.com/appbaseio/arc
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/fortytw2/leaktest v1.2.0 // indirect
 	github.com/gobuffalo/envy v1.6.15 // indirect
 	github.com/gobuffalo/packr v1.22.0
-	github.com/google/go-cmp v0.2.0 // indirect
 	github.com/google/uuid v1.0.0
-	github.com/gorilla/context v1.1.1 // indirect
-	github.com/gorilla/mux v1.6.2
-	github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
-	github.com/olivere/elastic v6.2.16+incompatible
+	github.com/gorilla/mux v1.7.1
+	github.com/hashicorp/go-hclog v0.10.0 // indirect
+	github.com/hashicorp/go-retryablehttp v0.6.3
+	github.com/olivere/elastic v6.2.21+incompatible
+	github.com/olivere/elastic/v7 v7.0.4
+	github.com/robfig/cron v1.1.0
 	github.com/rogpeppe/go-internal v1.2.2 // indirect
 	github.com/rs/cors v1.6.0
 	github.com/siddharthlatest/mustache v0.0.0-20160118163553-00029677272d
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/stretchr/testify v1.3.0
 	github.com/ulule/limiter v2.2.0+incompatible
-	golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc
+	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
-	gopkg.in/olivere/elastic.v6 v6.2.21
+	gopkg.in/olivere/elastic.v6 v6.2.26
 )
-Original file line number
+Diff line change
 *.http
 tags
++
 +config