logstash-integration-elastic_enterprise_search 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6276fe38b651d58dcfa68a99d6d6de58f4b7a35d4e5cf640f996cbd7b681a7ad
-  data.tar.gz: 373697b1c10c3c51af094d0415e407033ea1d987d776f4c0e0a83146b998f2cf
+  metadata.gz: 2f0c1374a08bc723fd7452e115e7372c8e0bb416c6e7e2e6d10769b15b571b7c
+  data.tar.gz: 53debfd033dae11b5d5c80809c51c8a6db5997c80f5eeb3901414932c0d48e17
 SHA512:
-  metadata.gz: 898a93fb3d0516b4b6f2a0eb358a29809e581a56ed7c5ca3be21e95f778dd4e63b81e615dbe9bfb96a22cc1439d3f840f0e574a4b56de4e08de3a5eff36ccce9
-  data.tar.gz: 9f4edd07607d41ee54ec36141dd0b009ae8eb5c24364b05a200b419e2efdd800ed57694f10c150e56c1186ee54639fff31361a6c72e9ecff44fb431f251c82b9
+  metadata.gz: dcb96b16bafc1b85a0e4e375925b8d6ad5e6f3366044e1ea13b4318ab0c5b75b84d342fe76077ddcc30f4b0423f0e47028b474d2012e34570357a07ad9ff94e8
+  data.tar.gz: fab4c000386cca49902de6f11aa392d95032b4fd7897826fc7515dac40012315c2356d1c624485b4689faf229b7455176845ac40cdf3c298e596ad517a545a93

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.2.1
+ - Fix, change implementation of connectivity check method to be compatible with version `v8.0+` of Workplace Search [#16](https://github.com/logstash-plugins/logstash-integration-elastic_enterprise_search/pull/16) 
 
 ## 2.2.0
  - Feature, switch the connection library to elastic-enterprise-search [#3](https://github.com/logstash-plugins/logstash-integration-elastic_enterprise_search/pull/3)

data/lib/logstash/outputs/elastic_workplace_search.rb

@@ -101,6 +101,7 @@ class LogStash::Outputs::ElasticWorkplaceSearch < LogStash::Outputs::Base
   end
 
   def check_connection!
-    @client.list_all_permissions(@source)
+    # This is the preferred way to check compatibility across different versions of Workplace Search service.
+    @client.index_documents(@source, {:documents => []})
   end
 end

data/logstash-integration-elastic_enterprise_search.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-integration-elastic_enterprise_search'
-  s.version         = '2.2.0'
+  s.version         = '2.2.1'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Integration with Elastic Enterprise Search - output plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline "+

data/spec/integration/outputs/elastic_workplace_search_spec.rb

@@ -8,25 +8,68 @@ require "base64"
 
 describe "indexing against running Workplace Search", :integration => true do
 
+  def is_version7?
+    ENV['ELASTIC_STACK_VERSION'].strip.start_with?("7")
+  end
+
   let(:url) { ENV['ENTERPRISE_SEARCH_URL'] }
   let(:auth) { Base64.strict_encode64("#{ENV['ENTERPRISE_SEARCH_USERNAME']}:#{ENV['ENTERPRISE_SEARCH_PASSWORD']}")}
   let(:source) do
+    if is_version7?
+      response = Faraday.get(
+        "#{url}/api/ws/v1/whoami",
+        {"get_token" => true},
+        {"Content-Type" => "application/json",
+        "Accept" => "application/json",
+        "Authorization" => "Basic #{auth}"}
+      )
+      JSON.load(response.body)
+    else
+      # Workplace Search v8.0+ provides the api_tokens API to create or retrieve
+      # the key to be use as access_token
+      conn = Faraday.new(url: url)
+      conn.basic_auth(ENV['ENTERPRISE_SEARCH_USERNAME'], ENV['ENTERPRISE_SEARCH_PASSWORD'])
+      response = conn.post('/ws/org/api_tokens',
+                            '{"name":"ls-integration-test-key"}',
+                            {"Content-Type" => "application/json", "Accept" => "application/json"})
+      create_response_json = JSON.load(response.body)
+      if create_response_json.has_key?("errors") && create_response_json["errors"].include?("Name is already taken")
+        # when a key with the name already exists, retrieve it
+        response = conn.get('/ws/org/api_tokens', nil,  {"Content-Type" => "application/json", "Accept" => "application/json"})
+        retrieve_token_response_json = JSON.load(response.body)
+        response_json = retrieve_token_response_json["results"].find {|res| res["id"] == "ls-integration-test-key"}
+      else
+        response_json = create_response_json
+      end
+
+      conn.close
+      response_json
+    end
+  end
+  let(:access_token) do
+    if is_version7?
+      source.fetch("access_token")
+    else
+      source.fetch("key")
+    end
+  end
+  let(:source_id) do
     response = Faraday.post(
-      "#{url}/ws/org/sources/form_create",
-      JSON.dump("service_type" => "custom", "name" => "whatever"),
-      "Content-Type" => "application/json",
-      "Accept" => "application/json",
-      "Authorization" => "Basic #{auth}"
-    )
-    JSON.load(response.body)
+          "#{url}/api/ws/v1/sources",
+           JSON.dump("service_type" => "custom", "name" => "whatever"),
+          {"Content-Type" => "application/json",
+          "Accept" => "application/json",
+          "Authorization" => "Bearer #{access_token}"}
+        )
+    source_response_json = JSON.load(response.body)
+    source_response_json.fetch("id")
   end
-  let(:source_id) { source.fetch("id") }
 
   let(:config) do
     {
       "url" => url,
       "source" => source_id,
-      "access_token" => source.fetch("accessToken")
+      "access_token" => access_token
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-elastic_enterprise_search
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement