From a4cfe7d9b1e6911b8282f604324635acba677a75 Mon Sep 17 00:00:00 2001 From: Theo Truong Date: Thu, 12 Dec 2024 12:34:23 -0700 Subject: [PATCH] # Signed-off-by: Theo Truong --- lib/opensearch-dsl.rb | 1 - lib/opensearch-ruby.rb | 1 - .../validation_integration_spec.rb | 39 ------------------ .../validation_integration_spec.rb | 40 ------------------- 4 files changed, 81 deletions(-) delete mode 100644 spec/opensearch/client/integration/security_disabled/validation_integration_spec.rb delete mode 100644 spec/opensearch/client/integration/security_enabled/validation_integration_spec.rb diff --git a/lib/opensearch-dsl.rb b/lib/opensearch-dsl.rb index 7f232a29b..55f6525b3 100644 --- a/lib/opensearch-dsl.rb +++ b/lib/opensearch-dsl.rb @@ -24,5 +24,4 @@ # specific language governing permissions and limitations # under the License. -require 'active_support' require 'opensearch/dsl' diff --git a/lib/opensearch-ruby.rb b/lib/opensearch-ruby.rb index ca7406b81..a4488d9e6 100644 --- a/lib/opensearch-ruby.rb +++ b/lib/opensearch-ruby.rb @@ -24,5 +24,4 @@ # specific language governing permissions and limitations # under the License. -require 'active_support' require 'opensearch' diff --git a/spec/opensearch/client/integration/security_disabled/validation_integration_spec.rb b/spec/opensearch/client/integration/security_disabled/validation_integration_spec.rb deleted file mode 100644 index 1717a7450..000000000 --- a/spec/opensearch/client/integration/security_disabled/validation_integration_spec.rb +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. -# -# Modifications Copyright OpenSearch Contributors. See -# GitHub history for details. -# -# Licensed to Elasticsearch B.V. under one or more contributor -# license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright -# ownership. Elasticsearch B.V. licenses this file to you under -# the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -require_relative '../../../../spec_helper' -require 'logger' - -describe 'OpenSearch validation integration' do - it 'Validates for OpenSearch' do - client = OpenSearch::Client.new( - host: OPENSEARCH_URL, - logger: Logger.new($stderr) - ) - expect(client.instance_variable_get('@verified')).to be false - client.count - expect(client.instance_variable_get('@verified')).to be true - end -end diff --git a/spec/opensearch/client/integration/security_enabled/validation_integration_spec.rb b/spec/opensearch/client/integration/security_enabled/validation_integration_spec.rb deleted file mode 100644 index 40d438de8..000000000 --- a/spec/opensearch/client/integration/security_enabled/validation_integration_spec.rb +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. -# -# Modifications Copyright OpenSearch Contributors. See -# GitHub history for details. -# -# Licensed to Elasticsearch B.V. under one or more contributor -# license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright -# ownership. Elasticsearch B.V. licenses this file to you under -# the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -require_relative '../../../../spec_helper' -require 'logger' - -describe 'OpenSearch validation integration with security plugin enabled' do - it 'Validates for OpenSearch' do - client = OpenSearch::Client.new( - host: OPENSEARCH_URL, - logger: Logger.new($stderr), - transport_options: { ssl: { verify: false } } - ) - expect(client.instance_variable_get('@verified')).to be false - client.count - expect(client.instance_variable_get('@verified')).to be true - end -end