Sync upstream changes and prepare OSS defaults

Author: siddharthlatest

.gitignore

@@ -7,4 +7,7 @@ log
 telemetrylog
 .vscode
 indices
-data
+data
+*.pgo
+es_load_check.sh
+ali-body.json

Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.21.3 AS builder
+FROM golang:1.26.0 AS builder
 
-ARG VERSION=8.22.2
+ARG VERSION=9.2.0
 ENV VERSION="${VERSION}"
 
 # Default value
 # Run `--build-arg BILLING=true` to enable billing
-ARG BILLING=true
+ARG BILLING=false
 ENV BILLING="${BILLING}"
 
 # Run `--build-arg HOSTED_BILLING=true` to enable billing for hosted reactivesearch
@@ -18,7 +18,7 @@ ENV CLUSTER_BILLING="${CLUSTER_BILLING}"
 
 
 # Run `--build-arg OPENSOURCE=true` to build opensource 
-ARG OPENSOURCE=false
+ARG OPENSOURCE=true
 ENV OPENSOURCE="${OPENSOURCE}"
 
 # Run `--build-arg IGNORE_BILLING_MIDDLEWARE=true` to disable billing middleware for testing

Dockerfile-byoc

@@ -1,13 +1,13 @@
 GC=go build
 
 BUILD_DIR=build
-DEFAULT_VERSION=8.22.2
+DEFAULT_VERSION=9.2.0
 VERSION := $(or $(VERSION),$(DEFAULT_VERSION))
 
 cmd: build
 
 build:
-	$(GC) -pgo=auto -ldflags "-w -X main.Billing=$(BILLING) -X main.HostedBilling=$(HOSTED_BILLING) -X main.ClusterBilling=$(CLUSTER_BILLING) -X main.Opensource=$(OPENSOURCE) -X main.PlanRefreshInterval=$(PLAN_REFRESH_INTERVAL) -X main.IgnoreBillingMiddleware=$(IGNORE_BILLING_MIDDLEWARE) -X main.Tier=$(TEST_TIER) -X main.FeatureCustomEvents=$(TEST_FEATURE_CUSTOM_EVENTS) -X main.FeatureSuggestions=$(TEST_FEATURE_SUGGESTIONS) -X main.FeatureOpenAI=$(TEST_FEATURE_OPEN_AI) -X main.Version=$(VERSION)" -o $(BUILD_DIR)/reactivesearch github.com/appbaseio-confidential/reactivesearch
+	$(GC) -pgo=auto -ldflags "-w -X main.Billing=$(BILLING) -X main.HostedBilling=$(HOSTED_BILLING) -X main.ClusterBilling=$(CLUSTER_BILLING) -X main.Opensource=$(OPENSOURCE) -X main.PlanRefreshInterval=$(PLAN_REFRESH_INTERVAL) -X main.IgnoreBillingMiddleware=$(IGNORE_BILLING_MIDDLEWARE) -X main.Tier=$(TEST_TIER) -X main.FeatureCustomEvents=$(TEST_FEATURE_CUSTOM_EVENTS) -X main.FeatureSuggestions=$(TEST_FEATURE_SUGGESTIONS) -X main.FeatureOpenAI=$(TEST_FEATURE_OPEN_AI) -X main.Version=$(VERSION)" -o $(BUILD_DIR)/reactivesearch github.com/appbaseio/reactivesearch-api
 
 clean:
 	rm -rf $(BUILD_DIR)

Dockerfile-cluster

@@ -1,6 +1,6 @@
 # ReactiveSearch API
 
-[![Tests](https://github.com/appbaseio/reactivesearch-api/actions/workflows/tests.yml/badge.svg)](https://github.com/appbaseio/reactivesearch-api/actions/workflows/tests.yml) [![Docker](https://github.com/appbaseio/reactivesearch-api/actions/workflows/docker-image.yml/badge.svg)](https://github.com/appbaseio/reactivesearch-api/actions/workflows/docker-image.yml)
+[![Tests](https://github.com/appbaseio/reactivesearch-api/actions/workflows/tests.yml/badge.svg)](https://github.com/appbaseio/reactivesearch-api/actions/workflows/tests.yml) [![Docker](https://github.com/appbaseio/reactivesearch-api/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/appbaseio/reactivesearch-api/actions/workflows/docker-publish.yml)
 
 ReactiveSearch API is a declarative, open-source API for querying Elasticsearch, OpenSearch, Solr, MongoDB Atlas Search and OpenAI. It also acts as a reverse proxy and API gateway for Elasticsearch and OpenSearch. ReactiveSearch API is best suited for site search, app search and e-commerce search use-cases.
 
@@ -41,29 +41,20 @@ docker network create reactivesearch
 2. Start a single node Elasticsearch cluster locally
 
 ```sh
-docker run -d --rm --name elasticsearch -p 9200:9200 -p 9300:9300 --net=reactivesearch -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:8.10.3
+docker run -d --rm --name elasticsearch -p 9200:9200 -p 9300:9300 --net=reactivesearch -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:8.17.0
 ```
 
-> NOTE: It is advised to use `-e "xpack.security.enabled=false"` for local runs of ElasticSearch since otherwise ES is not available on :9200.
+> NOTE: It is advised to use `-e "xpack.security.enabled=false"` for local runs of Elasticsearch since otherwise ES is not available on :9200.
 
 OR
 
 Alternative to using Elasticsearch, you can also start a single node OpenSearch cluster locally
 
 ```sh
-docker run --name opensearch --rm -d -p 9200:9200 -e http.port=9200 -e discovery.type=single-node -e http.max_content_length=10MB -e http.cors.enabled=true -e http.cors.allow-origin=\* -e http.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization -e http.cors.allow-credentials=true -e "plugins.security.disabled=true" --net=reactivesearch opensearchproject/opensearch:2.10.0
+docker run --name opensearch --rm -d -p 9200:9200 -e http.port=9200 -e discovery.type=single-node -e http.max_content_length=10MB -e http.cors.enabled=true -e http.cors.allow-origin=\* -e http.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization -e http.cors.allow-credentials=true -e "plugins.security.disabled=true" --net=reactivesearch opensearchproject/opensearch:latest
 ```
 
-3. Start Zinc locally
-
-```sh
-mkdir data                                                                                                                            
-docker run --rm -d -v data:/data -e ZINC_DATA_PATH="/data" -p 4080:4080 --net=reactivesearch \
-    -e ZINC_FIRST_ADMIN_USER=appbase -e ZINC_FIRST_ADMIN_PASSWORD=zincf0rappbase \
-    --name zinc public.ecr.aws/zinclabs/zinc:latest
-```
-
-4. Start ReactiveSearch locally
+3. Start ReactiveSearch locally
 
 ```sh
 docker build -t reactivesearch . && docker run --rm --name reactivesearch -p 8000:8000 --net=reactivesearch --env-file=config/docker.env reactivesearch --log=info --diff-logs=false --enable-telemetry=false --enable-logs=true --disable-health-check=true

Makefile

@@ -12,7 +12,7 @@
 			"region": "us-east-1",
 			"instance_type": "t2.micro",
 			"ssh_username": "ec2-user",
-			"source_ami": "ami-0eaf8bcec9ab4bde5",
+			"source_ami": "ami-086ec7d10754b79ca",
 			"ami_name": "reactivesearch-api-{{user `VERSION` | clean_resource_name}}",
 			"ssh_timeout": "10m",
 			"ami_regions": ["us-east-1"],

README.md

@@ -22,8 +22,10 @@ services:
   reactivesearch:
     build: ./
     container_name: reactivesearch
-    env_file:
-      - config/docker.env
+    environment:
+      - ES_CLUSTER_URL=http://elasticsearch:9200
+      - USERNAME=admin
+      - PASSWORD=admin
     networks:
       - reactivesearch
     restart: on-failure

ami.json

@@ -38,7 +38,7 @@ The `greeter.go` would be responsible for implementing the `Plugin` interface an
 	import (
 		"fmt"
 
-		"github.com/appbaseio-confidential/reactivesearch/plugins"
+		"github.com/appbaseio/reactivesearch-api/plugins"
 	)
 
 	const pluginName = "greeter"
@@ -79,7 +79,7 @@ Define a list of routes that the plugin aims to handle.
 	import (
 	 	"net/http"
 
-  		"github.com/appbaseio-confidential/reactivesearch/plugins"
+  		"github.com/appbaseio/reactivesearch-api/plugins"
 	)
 
 	func (g *Greeter) routes() []plugin.Route {

docker-compose.yml

@@ -1,4 +1,4 @@
-module github.com/appbaseio-confidential/reactivesearch
+module github.com/appbaseio/reactivesearch-api
 
 go 1.16