elastomer-client 6.2.1 → 6.2.3

data/lib/elastomer_client/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ElastomerClient
-  VERSION = "6.2.1"
+  VERSION = "6.2.3"
 
   def self.version
     VERSION

data/script/generate-rest-api-spec

@@ -22,7 +22,7 @@ class RestApiSpecGenerator
 
   attr_reader :version, :short_version, :class_version
 
-  def initialize(version = "8.13")
+  def initialize(version = "8.18")
     @version = version
 
     sliced = @version.split(".").slice(0, 2)

data/script/setup-ccr

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Function to display help
+show_help() {
+  echo "Usage: $0 [option] [license]"
+  echo "Options:"
+  echo "  up      - Start the clusters and apply the license"
+  echo "  down    - Shut down the clusters"
+  echo "  help    - Display this help message"
+}
+
+# Function to apply the license to a cluster
+apply_license() {
+  local port=$1
+  local license="$2"
+  local response_file=$(mktemp)
+  local http_code
+  http_code=$(curl -s -o "$response_file" -w "%{http_code}" -X PUT "http://localhost:$port/_license?pretty" -H "Content-Type: application/json" -d "$license")
+  
+  if [ "$http_code" -ne 200 ]; then
+    echo "Failed to apply license to cluster on port $port. HTTP status code: $http_code"
+    echo "Error response: $(cat "$response_file")"
+    rm "$response_file"
+    exit 1
+  fi
+}
+
+# Function to shut down the clusters
+shutdown_clusters() {
+  docker compose --project-directory docker --profile ccr down
+  echo "Clusters shut down."
+}
+
+# Check for options
+case "$1" in
+  up)
+
+    # Get the directory of the current script
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+    # Start the clusters
+    docker compose --project-directory docker --profile ccr up -d
+
+    # Wait for both clusters to be online
+    export ES_PORT=9208
+    "$SCRIPT_DIR/poll-for-es"
+    export ES_PORT=9209
+    "$SCRIPT_DIR/poll-for-es"
+
+    # Apply the license to both clusters
+    LICENSE=$2
+    if [ -z "$LICENSE" ]; then
+      echo "License key is required as the second argument."
+      exit 1
+    fi
+
+    echo "Applying license to cluster on port 9208..."
+    apply_license 9208 "$LICENSE"
+    echo "Applying license to cluster on port 9209..."
+    apply_license 9209 "$LICENSE"
+    echo "License applied to both clusters."
+
+    # Set up the remote connection between the clusters
+    curl -X PUT "http://localhost:9209/_cluster/settings" -H "Content-Type: application/json" -d '{
+      "persistent": {
+        "cluster": {
+          "remote": {
+            "leader": {
+              "seeds": ["es8.18:9300"]
+            }
+          }
+        }
+      }
+    }'
+
+    echo "Clusters setup completed."
+    ;;
+  down)
+    shutdown_clusters
+    ;;
+  help)
+    show_help
+    ;;
+  *)
+    echo "Invalid option: $1"
+    show_help
+    exit 1
+    ;;
+esac

data/test/client/ccr_test.rb

@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+describe ElastomerClient::Client::Ccr do
+  before do
+    skip "Cannot test Ccr API without a replica cluster" unless $replica_client.available?
+
+    begin
+      ccr.delete_auto_follow("follower_pattern")
+    rescue StandardError
+      puts "No auto-follow pattern to delete"
+    end
+
+    @leader_index = $client.index("leader_index")
+    @follower_index = $replica_client.index("follower_index")
+    @auto_followed_index = $client.index("followed_index")
+    @auto_follower_index = $replica_client.index("followed_index-follower")
+
+    if @leader_index.exists?
+      @leader_index.delete
+    end
+    if @auto_followed_index.exists?
+      @auto_followed_index.delete
+    end
+    if @follower_index.exists?
+      @follower_index.delete
+    end
+    if @auto_follower_index.exists?
+      @auto_follower_index.delete
+    end
+
+    @leader_index.create(default_index_settings)
+    wait_for_index(@leader_index.name, "green")
+  end
+
+  after do
+    @leader_index.delete if @leader_index.exists?
+    @follower_index.delete if @follower_index.exists?
+    @auto_followed_index.delete if @auto_followed_index.exists?
+    @auto_follower_index.delete if @auto_follower_index.exists?
+
+    begin
+      ccr.delete_auto_follow("follower_pattern")
+    rescue StandardError
+      puts "No auto-follow pattern to delete"
+    end
+  end
+
+  def follow_index(follower_index_name, leader_index_name)
+    ccr = $replica_client.ccr
+    response = ccr.follow(follower_index_name, { leader_index: leader_index_name, remote_cluster: "leader" })
+    wait_for_index(follower_index_name, "green")
+    response
+  end
+
+  def pause_follow(follower_index_name)
+    ccr = $replica_client.ccr
+    response = ccr.pause_follow(follower_index_name)
+    wait_for_index(follower_index_name, "green")
+    response
+  end
+
+  def unfollow_index(follower_index_name)
+    ccr = $replica_client.ccr
+    response = ccr.unfollow(follower_index_name)
+    wait_for_index(follower_index_name, "green")
+    response
+  end
+
+  def create_document(index, type, document)
+    response = index.docs.index(document_wrapper(type, document))
+    index.refresh
+    response
+  end
+
+  it "successfully follows a leader index" do
+    create_document(@leader_index, "book", { _id: 1, title: "Book 1" })
+    follow_index(@follower_index.name, @leader_index.name)
+
+    doc = @follower_index.docs.get(id: 1, type: "book")
+
+    assert_equal "Book 1", doc["_source"]["title"]
+  end
+
+  it "successfully gets info for all follower indices" do
+    follow_index(@follower_index.name, @leader_index.name)
+
+    response = $replica_client.ccr.get_follower_info("*")
+
+    assert_equal response["follower_indices"][0]["follower_index"], @follower_index.name
+    assert_equal response["follower_indices"][0]["leader_index"], @leader_index.name
+  end
+
+  it "successfully pauses a follower index" do
+    follow_index(@follower_index.name, @leader_index.name)
+
+    response = pause_follow(@follower_index.name)
+
+    assert response["acknowledged"]
+
+    create_document(@leader_index, "book", { _id: 2, title: "Book 2" })
+
+    doc = @follower_index.docs.get(id: 2, type: "book")
+
+    refute doc["found"]
+  end
+
+  it "successfully unfollow a leader index" do
+    follow_index(@follower_index.name, @leader_index.name)
+
+    pause_follow(@follower_index.name)
+
+    @follower_index.close
+
+    response = unfollow_index(@follower_index.name)
+
+    assert response["acknowledged"]
+
+    @follower_index.open
+
+    wait_for_index(@follower_index.name, "green")
+
+    create_document(@leader_index, "book", { _id: 2, title: "Book 2" })
+
+    doc = @follower_index.docs.get(id: 2, type: "book")
+
+    refute doc["found"]
+  end
+
+  it "successfully implements an auto-follow policy" do
+    ccr = $replica_client.ccr
+
+    ccr.auto_follow("follower_pattern", { remote_cluster: "leader", leader_index_patterns: ["*"], follow_index_pattern: "{{leader_index}}-follower" })
+
+    @auto_followed_index.create(default_index_settings)
+    wait_for_index(@auto_followed_index.name, "green")
+
+    @auto_follower_index = $replica_client.index("followed_index-follower")
+    wait_for_index(@auto_follower_index.name, "green")
+
+    resp = ccr.get_auto_follow(pattern_name: "follower_pattern")
+
+    assert_equal "follower_pattern", resp["patterns"].first["name"]
+
+    assert_predicate @auto_follower_index, :exists?
+  end
+
+end

data/test/client/cluster_test.rb

@@ -79,7 +79,8 @@ describe ElastomerClient::Client::Cluster do
 
   it "returns cluster stats" do
     h = @cluster.stats
-    expected = $client.version_support.es_version_8_plus? ? %w[cluster_name cluster_uuid indices nodes snapshots status timestamp] : %w[cluster_name indices nodes status timestamp]
+    expected = $client.version_support.es_version_8_plus? ? %w[ccs cluster_name cluster_uuid indices nodes repositories snapshots status timestamp] : %w[cluster_name indices nodes status timestamp]
+
     expected.unshift("_nodes")
 
     assert_equal expected, h.keys.sort

data/test/client/reindex_test.rb

@@ -57,15 +57,16 @@ describe ElastomerClient::Client::Reindex do
     }
     response = reindex.reindex(body, requests_per_second: 0.01, wait_for_completion: false)
     task_id = response["task"]
+    node_id = task_id.split(":").first
+    task_number = task_id.split(":").last.to_i
 
-    reindex.rethrottle(task_id, requests_per_second: 1)
+    response = reindex.rethrottle(task_id, requests_per_second: 1)
 
-    tasks = $client.tasks
-    node_id = task_id.split(":").first
-    task_id = task_id.split(":").last.to_i
+    assert_equal 1, response["nodes"][node_id]["tasks"][task_id]["status"]["requests_per_second"]
 
     # wait for the task to complete
-    tasks.wait_by_id(node_id, task_id, "30s")
+    tasks = $client.tasks
+    tasks.wait_by_id(node_id, task_number, "30s")
 
     # Verify that the document has been reindexed
     doc = @dest_index.docs.get(id: 1, type: "book")

data/test/test_helper.rb

@@ -46,6 +46,19 @@ raise "No server available at #{$client.url}" unless $client.available?
 
 puts "Elasticsearch version is #{$client.version}"
 
+# Create client instance for replica cluster
+$replica_client_params = {
+  port: ENV.fetch("ES_REPLICA_PORT", 9201),
+  read_timeout: 10,
+  open_timeout: 1,
+  opaque_id: false,
+  strict_params: true,
+  compress_body: true
+}
+$replica_client = ElastomerClient::Client.new(**$replica_client_params)
+
+puts "Replica server is unavailable at #{$replica_client.url}" unless $replica_client.available?
+
 # remove any lingering test indices from the cluster
 Minitest.after_run do
   $client.cluster.indices.keys.each do |name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastomer-client
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.3
 platform: ruby
 authors:
 - Tim Pease
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -105,6 +105,7 @@ files:
 - README.md
 - Rakefile
 - docker/compose.yaml
+- docker/elasticsearch-follow.yml
 - docker/elasticsearch.yml
 - docker/elasticsearch8plus.yml
 - docs/README.md
@@ -121,6 +122,7 @@ files:
 - elastomer-client.gemspec
 - lib/elastomer_client/client.rb
 - lib/elastomer_client/client/bulk.rb
+- lib/elastomer_client/client/ccr.rb
 - lib/elastomer_client/client/cluster.rb
 - lib/elastomer_client/client/delete_by_query.rb
 - lib/elastomer_client/client/docs.rb
@@ -137,6 +139,8 @@ files:
 - lib/elastomer_client/client/rest_api_spec/api_spec.rb
 - lib/elastomer_client/client/rest_api_spec/api_spec_v5_6.rb
 - lib/elastomer_client/client/rest_api_spec/api_spec_v8_13.rb
+- lib/elastomer_client/client/rest_api_spec/api_spec_v8_17.rb
+- lib/elastomer_client/client/rest_api_spec/api_spec_v8_18.rb
 - lib/elastomer_client/client/rest_api_spec/api_spec_v8_7.rb
 - lib/elastomer_client/client/rest_api_spec/rest_api.rb
 - lib/elastomer_client/client/scroller.rb
@@ -157,8 +161,10 @@ files:
 - script/console
 - script/generate-rest-api-spec
 - script/poll-for-es
+- script/setup-ccr
 - test/assertions.rb
 - test/client/bulk_test.rb
+- test/client/ccr_test.rb
 - test/client/cluster_test.rb
 - test/client/docs_test.rb
 - test/client/errors_test.rb
@@ -206,13 +212,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Elasticsearch
 test_files:
 - test/assertions.rb
 - test/client/bulk_test.rb
+- test/client/ccr_test.rb
 - test/client/cluster_test.rb
 - test/client/docs_test.rb
 - test/client/errors_test.rb