# Removed active support

Signed-off-by: Theo Truong <theotr@amazon.com>

api_generator/lib/components/api_path.rb

@@ -15,7 +15,7 @@ def initialize(url)
   def build
     return "'/'" if components.empty?
     return components.join('/') if components.none? { |comp| comp.start_with?('_') }
-    "[#{components.join(', ')}].filter(&:present?).join('/').squeeze('/')"
+    "Utils.build_url(#{components.join(', ')})"
   end
 
   def components

lib/opensearch/api/actions/asynchronous_search/delete.rb

@@ -27,7 +27,7 @@ def delete(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'DELETE'
-          url     = ['_plugins/_asynchronous_search', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_plugins/_asynchronous_search', _id)
 
           Utils.validate_query_params args
           transport.perform_delete_request method, url, args, body, headers, ignore.include?(404)

lib/opensearch/api/actions/asynchronous_search/get.rb

@@ -25,7 +25,7 @@ def get(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_plugins/_asynchronous_search', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_plugins/_asynchronous_search', _id)
 
           Utils.validate_query_params args
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/bulk.rb

@@ -36,7 +36,7 @@ def bulk(args = {})
           headers = (args.delete('headers') || {}).merge('Content-Type' => 'application/x-ndjson')
           body    = Utils.bulkify(args.delete('body'))
           method  = _index.nil? ? 'POST' : 'PUT'
-          url     = [_index, '_bulk'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_bulk')
 
           Utils.validate_query_params args, BULK_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/bulk_stream.rb

@@ -38,7 +38,7 @@ def bulk_stream(args = {})
           headers = (args.delete('headers') || {}).merge('Content-Type' => 'application/x-ndjson')
           body    = Utils.bulkify(args.delete('body'))
           method  = _index.nil? ? 'POST' : 'PUT'
-          url     = [_index, '_bulk/stream'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_bulk/stream')
 
           Utils.validate_query_params args, BULK_STREAM_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/aliases.rb

@@ -30,7 +30,7 @@ def aliases(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/aliases', _name].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/aliases', _name)
 
           Utils.validate_query_params args, ALIASES_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/allocation.rb

@@ -32,7 +32,7 @@ def allocation(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/allocation', _node_id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/allocation', _node_id)
 
           Utils.validate_query_params args, ALLOCATION_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/count.rb

@@ -28,7 +28,7 @@ def count(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/count', _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/count', _index)
 
           Utils.validate_query_params args, COUNT_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/fielddata.rb

@@ -29,7 +29,7 @@ def fielddata(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/fielddata', _fields].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/fielddata', _fields)
 
           Utils.validate_query_params args, FIELDDATA_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/indices.rb

@@ -37,7 +37,7 @@ def indices(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/indices', _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/indices', _index)
 
           Utils.validate_query_params args, INDICES_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/recovery.rb

@@ -32,7 +32,7 @@ def recovery(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/recovery', _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/recovery', _index)
 
           Utils.validate_query_params args, RECOVERY_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/segment_replication.rb

@@ -39,7 +39,7 @@ def segment_replication(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/segment_replication', _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/segment_replication', _index)
 
           Utils.validate_query_params args, SEGMENT_REPLICATION_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/segments.rb

@@ -31,7 +31,7 @@ def segments(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/segments', _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/segments', _index)
 
           Utils.validate_query_params args, SEGMENTS_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/shards.rb

@@ -33,7 +33,7 @@ def shards(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/shards', _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/shards', _index)
 
           Utils.validate_query_params args, SHARDS_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/snapshots.rb

@@ -34,7 +34,7 @@ def snapshots(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/snapshots', _repository].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/snapshots', _repository)
 
           Utils.validate_query_params args, SNAPSHOTS_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/templates.rb

@@ -31,7 +31,7 @@ def templates(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/templates', _name].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/templates', _name)
 
           Utils.validate_query_params args, TEMPLATES_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cat/thread_pool.rb

@@ -33,7 +33,7 @@ def thread_pool(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cat/thread_pool', _thread_pool_patterns].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cat/thread_pool', _thread_pool_patterns)
 
           Utils.validate_query_params args, THREAD_POOL_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/clear_scroll.rb

@@ -26,7 +26,7 @@ def clear_scroll(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'DELETE'
-          url     = ['_search/scroll', _scroll_id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_search/scroll', _scroll_id)
 
           Utils.validate_query_params args
           transport.perform_delete_request method, url, args, body, headers, ignore.include?(404)

lib/opensearch/api/actions/cluster/delete_component_template.rb

@@ -30,7 +30,7 @@ def delete_component_template(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'DELETE'
-          url     = ['_component_template', _name].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_component_template', _name)
 
           Utils.validate_query_params args, DELETE_COMPONENT_TEMPLATE_QUERY_PARAMS
           transport.perform_delete_request method, url, args, body, headers, ignore.include?(404)

lib/opensearch/api/actions/cluster/exists_component_template.rb

@@ -28,7 +28,7 @@ def exists_component_template(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'HEAD'
-          url     = ['_component_template', _name].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_component_template', _name)
 
           Utils.validate_query_params args, EXISTS_COMPONENT_TEMPLATE_QUERY_PARAMS
           transport.perform_head_request method, url, args, body, headers

lib/opensearch/api/actions/cluster/get_component_template.rb

@@ -26,7 +26,7 @@ def get_component_template(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_component_template', _name].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_component_template', _name)
 
           Utils.validate_query_params args, GET_COMPONENT_TEMPLATE_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/get_decommission_awareness.rb

@@ -25,7 +25,7 @@ def get_decommission_awareness(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cluster/decommission/awareness', _awareness_attribute_name, '_status'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cluster/decommission/awareness', _awareness_attribute_name, '_status')
 
           Utils.validate_query_params args
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/get_weighted_routing.rb

@@ -25,7 +25,7 @@ def get_weighted_routing(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cluster/routing/awareness', _attribute, 'weights'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cluster/routing/awareness', _attribute, 'weights')
 
           Utils.validate_query_params args
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/health.rb

@@ -36,7 +36,7 @@ def health(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cluster/health', _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cluster/health', _index)
 
           Utils.validate_query_params args, HEALTH_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/put_component_template.rb

@@ -31,7 +31,7 @@ def put_component_template(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'POST'
-          url     = ['_component_template', _name].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_component_template', _name)
 
           Utils.validate_query_params args, PUT_COMPONENT_TEMPLATE_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/put_decommission_awareness.rb

@@ -28,7 +28,7 @@ def put_decommission_awareness(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'PUT'
-          url     = ['_cluster/decommission/awareness', _awareness_attribute_name, _awareness_attribute_value].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cluster/decommission/awareness', _awareness_attribute_name, _awareness_attribute_value)
 
           Utils.validate_query_params args
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/put_weighted_routing.rb

@@ -26,7 +26,7 @@ def put_weighted_routing(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'PUT'
-          url     = ['_cluster/routing/awareness', _attribute, 'weights'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cluster/routing/awareness', _attribute, 'weights')
 
           Utils.validate_query_params args
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/state.rb

@@ -34,7 +34,7 @@ def state(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cluster/state', _metric, _index].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cluster/state', _metric, _index)
 
           Utils.validate_query_params args, STATE_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/cluster/stats.rb

@@ -29,7 +29,7 @@ def stats(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'GET'
-          url     = ['_cluster/stats', _metric, _index_metric, 'nodes', _node_id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_cluster/stats', _metric, _index_metric, 'nodes', _node_id)
 
           Utils.validate_query_params args, STATS_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/count.rb

@@ -38,7 +38,7 @@ def count(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = body ? 'POST' : 'GET'
-          url     = [_index, '_count'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_count')
 
           Utils.validate_query_params args, COUNT_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/create.rb

@@ -38,7 +38,7 @@ def create(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'POST'
-          url     = [_index, '_create', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_create', _id)
 
           Utils.validate_query_params args, CREATE_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/create_pit.rb

@@ -30,7 +30,7 @@ def create_pit(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'POST'
-          url     = [_index, '_search/point_in_time'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_search/point_in_time')
 
           Utils.validate_query_params args, CREATE_PIT_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/dangling_indices/delete_dangling_index.rb

@@ -32,7 +32,7 @@ def delete_dangling_index(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'DELETE'
-          url     = ['_dangling', _index_uuid].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_dangling', _index_uuid)
 
           Utils.validate_query_params args, DELETE_DANGLING_INDEX_QUERY_PARAMS
           transport.perform_delete_request method, url, args, body, headers, ignore.include?(404)

lib/opensearch/api/actions/dangling_indices/import_dangling_index.rb

@@ -30,7 +30,7 @@ def import_dangling_index(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'POST'
-          url     = ['_dangling', _index_uuid].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_dangling', _index_uuid)
 
           Utils.validate_query_params args, IMPORT_DANGLING_INDEX_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/delete.rb

@@ -38,7 +38,7 @@ def delete(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'DELETE'
-          url     = [_index, '_doc', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_doc', _id)
 
           Utils.validate_query_params args, DELETE_QUERY_PARAMS
           transport.perform_delete_request method, url, args, body, headers, ignore.include?(404)

lib/opensearch/api/actions/delete_by_query.rb

@@ -60,7 +60,7 @@ def delete_by_query(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'POST'
-          url     = [_index, '_delete_by_query'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_delete_by_query')
 
           Utils.validate_query_params args, DELETE_BY_QUERY_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/delete_by_query_rethrottle.rb

@@ -26,7 +26,7 @@ def delete_by_query_rethrottle(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'POST'
-          url     = ['_delete_by_query', _task_id, '_rethrottle'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_delete_by_query', _task_id, '_rethrottle')
 
           Utils.validate_query_params args, DELETE_BY_QUERY_RETHROTTLE_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/delete_script.rb

@@ -30,7 +30,7 @@ def delete_script(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'DELETE'
-          url     = ['_scripts', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url('_scripts', _id)
 
           Utils.validate_query_params args, DELETE_SCRIPT_QUERY_PARAMS
           transport.perform_delete_request method, url, args, body, headers, ignore.include?(404)

lib/opensearch/api/actions/exists.rb

@@ -38,7 +38,7 @@ def exists(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'HEAD'
-          url     = [_index, '_doc', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_doc', _id)
 
           Utils.validate_query_params args, EXISTS_QUERY_PARAMS
           transport.perform_head_request method, url, args, body, headers

lib/opensearch/api/actions/exists_source.rb

@@ -37,7 +37,7 @@ def exists_source(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = 'HEAD'
-          url     = [_index, '_source', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_source', _id)
 
           Utils.validate_query_params args, EXISTS_SOURCE_QUERY_PARAMS
           transport.perform_head_request method, url, args, body, headers

lib/opensearch/api/actions/explain.rb

@@ -41,7 +41,7 @@ def explain(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = body ? 'POST' : 'GET'
-          url     = [_index, '_explain', _id].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_explain', _id)
 
           Utils.validate_query_params args, EXPLAIN_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body

lib/opensearch/api/actions/field_caps.rb

@@ -29,7 +29,7 @@ def field_caps(args = {})
           headers = args.delete('headers') || {}
           body    = args.delete('body')
           method  = body ? 'POST' : 'GET'
-          url     = [_index, '_field_caps'].filter(&:present?).join('/').squeeze('/')
+          url     = Utils.build_url(_index, '_field_caps')
 
           Utils.validate_query_params args, FIELD_CAPS_QUERY_PARAMS
           transport.perform_request(method, url, args, body, headers).body