From 0e054cfc8428dacb0d63843875906a5b7746d802 Mon Sep 17 00:00:00 2001 From: gmanipon Date: Tue, 24 Oct 2023 11:38:05 -0700 Subject: [PATCH] don't ignore 400 status code errors - need to expose errors in ES template format otherwise they go undetected and the ES template is not applied - bump version --- scripts/create_hysds_ios_index.py | 2 +- scripts/create_index.py | 2 +- scripts/install_base_es_template.py | 2 +- scripts/install_es_template.py | 2 +- scripts/install_ingest_pipeline.py | 2 +- scripts/rename_s3_datasets.py | 2 +- setup.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/create_hysds_ios_index.py b/scripts/create_hysds_ios_index.py index 0eb46f5..5f0cb02 100755 --- a/scripts/create_hysds_ios_index.py +++ b/scripts/create_hysds_ios_index.py @@ -23,4 +23,4 @@ body = json.load(f) # create destination index - mozart_es.es.indices.create(HYSDS_IOS_INDEX, body, ignore=400) + mozart_es.es.indices.create(HYSDS_IOS_INDEX, body) diff --git a/scripts/create_index.py b/scripts/create_index.py index 30a03ee..f5f614b 100755 --- a/scripts/create_index.py +++ b/scripts/create_index.py @@ -21,4 +21,4 @@ # get connection and create destination index es_url = app.config['ES_URL'] es = Elasticsearch(hosts=[es_url]) -es.indices.create(index=dest, ignore=400) +es.indices.create(index=dest) diff --git a/scripts/install_base_es_template.py b/scripts/install_base_es_template.py index 1193fad..2ae41eb 100755 --- a/scripts/install_base_es_template.py +++ b/scripts/install_base_es_template.py @@ -20,7 +20,7 @@ def write_template(tmpl_file): tmpl = json.load(f) # https://elasticsearch-py.readthedocs.io/en/1.3.0/api.html#elasticsearch.Elasticsearch.put_template - grq_es.es.indices.put_template(name="index_defaults", body=tmpl, ignore=400) + grq_es.es.indices.put_template(name="index_defaults", body=tmpl) print(f"Successfully installed template to index_defaults:\n{json.dumps(tmpl, indent=2)}") diff --git a/scripts/install_es_template.py b/scripts/install_es_template.py index b61175e..d473882 100755 --- a/scripts/install_es_template.py +++ b/scripts/install_es_template.py @@ -19,7 +19,7 @@ def write_template(prefix, alias, tmpl_file): tmpl = Template(f.read()).render(prefix=prefix, alias=alias) # https://elasticsearch-py.readthedocs.io/en/1.3.0/api.html#elasticsearch.Elasticsearch.put_template - grq_es.es.indices.put_template(name=alias, body=tmpl, ignore=400) + grq_es.es.indices.put_template(name=alias, body=tmpl) print(("Successfully installed template %s" % alias)) diff --git a/scripts/install_ingest_pipeline.py b/scripts/install_ingest_pipeline.py index 10200f7..f36e435 100755 --- a/scripts/install_ingest_pipeline.py +++ b/scripts/install_ingest_pipeline.py @@ -22,4 +22,4 @@ pipeline_name = 'dataset_pipeline' # https://elasticsearch-py.readthedocs.io/en/master/api.html#elasticsearch.client.IngestClient - grq_es.es.ingest.put_pipeline(id=pipeline_name, body=pipeline_settings, ignore=400) + grq_es.es.ingest.put_pipeline(id=pipeline_name, body=pipeline_settings) diff --git a/scripts/rename_s3_datasets.py b/scripts/rename_s3_datasets.py index d0c6d45..6303920 100755 --- a/scripts/rename_s3_datasets.py +++ b/scripts/rename_s3_datasets.py @@ -72,7 +72,7 @@ def create_index(index, doctype): # get connection and create index es_url = 'http://localhost:9200' es = Elasticsearch(hosts=[es_url]) - es.indices.create(index, ignore=400) + es.indices.create(index) url_keys = ['urls', 'browse_urls'] diff --git a/setup.py b/setup.py index 28bcc59..615c0cd 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='grq2', - version='2.0.26', + version='2.0.27', long_description='GeoRegionQuery REST API using ElasticSearch backend', packages=find_packages(), include_package_data=True,