Merge pull request #1 from geocodeearth/strict_content_type_checking

set json request header to avoid errors in es6+

Author: orangejulius

add_replica.sh

@@ -8,8 +8,10 @@ replica_count="${replica_count:-1}"
 
 echo "setting replica count to $replica_count on $index_name index in $cluster_url"
 
-curl -XPUT "$cluster_url/$index_name/_settings" -d "{
-        \"index\" : {
-                \"number_of_replicas\" : $replica_count
-        }
+curl -XPUT "$cluster_url/$index_name/_settings" \
+  -H 'Content-Type: application/json' \
+  -d "{
+  \"index\" : {
+    \"number_of_replicas\" : $replica_count
+  }
 }"

count_types.sh

@@ -6,7 +6,9 @@ echo "counting all types on $cluster_url"
 
 # query for all source values with an aggregation
 # this requires fielddata to be loaded, which takes a bit of memory
-curl -s -XPOST "$cluster_url/pelias/_search?size=0" -d '{
+curl -s -XPOST "$cluster_url/pelias/_search?size=0" \
+  -H 'Content-Type: application/json' \
+  -d '{
   "aggs" : {
     "source_count" : { "terms" : { "field" : "source" } }
   }
@@ -15,7 +17,9 @@ curl -s -XPOST "$cluster_url/pelias/_search?size=0" -d '{
 
 # query for all layer values with an aggregation
 # this requires fielddata to be loaded, which takes a bit of memory
-curl -s -XPOST "$cluster_url/pelias/_search?size=0" -d '{
+curl -s -XPOST "$cluster_url/pelias/_search?size=0" \
+  -H 'Content-Type: application/json' \
+  -d '{
   "aggs" : {
     "layer_count" : { "terms" : { "field" : "layer", "size": 20 } }
   }

enable_slowlog.sh

@@ -4,7 +4,9 @@ set -euo pipefail
 cluster_url="${cluster_url:-http://localhost:9200}"
 echo "enabling slowlog for searching and indexing on $cluster_url"
 
-curl -XPUT "$cluster_url/_cluster/settings" -d '{
+curl -XPUT "$cluster_url/_cluster/settings" \
+  -H 'Content-Type: application/json' \
+  -d '{
   "persistent": {
     "index.search.slowlog.threshold.query.warn": "10s",
     "index.search.slowlog.threshold.query.info": "5s",

increase_bulk_thread_pool.sh

@@ -3,4 +3,6 @@ set -eu
 
 cluster_url="${cluster_url:-http://localhost:9200}"
 echo "setting threadpool.bulk.queue_size to 500 on $cluster_url"
-curl -XPUT ${cluster_url}/_cluster/settings -d '{ "transient" : { "threadpool.bulk.queue_size" : 500 } }'
+curl -XPUT ${cluster_url}/_cluster/settings \
+  -H 'Content-Type: application/json' \
+  -d '{ "transient" : { "threadpool.bulk.queue_size" : 500 } }'

load_snapshot.sh

@@ -14,7 +14,9 @@ new_snapshot_name="${new_snapshot_name:-pelias-2017.11.18-001123}"
 read_only="${read_only:-true}"
 
 # create bucket, only needs to be run once
-curl -XPOST "$cluster_url/_snapshot/$es_repo_name" -d "{
+curl -XPOST "$cluster_url/_snapshot/$es_repo_name" \
+  -H 'Content-Type: application/json' \
+  -d "{
  \"type\": \"s3\",
    \"settings\": {
    \"bucket\": \"$s3_bucket\",
@@ -26,7 +28,9 @@ curl -XPOST "$cluster_url/_snapshot/$es_repo_name" -d "{
 }"
 
 ## import new snapshot with name including timestamp
-curl -XPOST "$cluster_url/_snapshot/$es_repo_name/${new_snapshot_name}/_restore" -d "{
+curl -XPOST "$cluster_url/_snapshot/$es_repo_name/${new_snapshot_name}/_restore" \
+  -H 'Content-Type: application/json' \
+  -d "{
   \"indices\": \"pelias\",
   \"rename_pattern\": \"pelias\",
   \"rename_replacement\": \"$new_snapshot_name\"

make_alias.sh

@@ -6,7 +6,9 @@ index_name="${index_name:-pelias-2017.11.18-001123}"
 
 echo "setting pelias alias to $index_name on $cluster_url"
 
-curl -XPOST "$cluster_url/_aliases" -d "{
+curl -XPOST "$cluster_url/_aliases" \
+  -H 'Content-Type: application/json' \
+  -d "{
   \"actions\": [{
     \"add\": {
 	  \"index\": \"$index_name\",

make_cluster_read_only.sh

@@ -4,7 +4,9 @@ set -ue
 
 cluster_url="${cluster_url:-http://localhost:9200}"
 
-curl -s -XPUT "$cluster_url/_cluster/settings" -d '{
+curl -s -XPUT "$cluster_url/_cluster/settings" \
+  -H 'Content-Type: application/json' \
+  -d '{
   "persistent" : {
     "cluster.blocks.read_only" : true
   }

make_cluster_read_write.sh

@@ -4,7 +4,9 @@ set -ue
 
 cluster_url="${cluster_url:-http://localhost:9200}"
 
-curl -s -XPUT "$cluster_url/_cluster/settings" -d '{
+curl -s -XPUT "$cluster_url/_cluster/settings" \
+  -H 'Content-Type: application/json' \
+  -d '{
   "persistent" : {
     "cluster.blocks.read_only" : false
   }

make_snapshot.sh

@@ -22,7 +22,9 @@ s3_bucket="${s3_bucket:-pelias-elasticsearch.nextzen.org}"
 
 # create Elasticsearch repository from settings
 set -x
-curl -XPOST "$cluster_url/_snapshot/$es_repo_name" -d "{
+curl -XPOST "$cluster_url/_snapshot/$es_repo_name" \
+  -H 'Content-Type: application/json' \
+  -d "{
  \"type\": \"s3\",
    \"settings\": {
    \"bucket\": \"$s3_bucket\",
@@ -32,7 +34,9 @@ curl -XPOST "$cluster_url/_snapshot/$es_repo_name" -d "{
 }"
 
 # create snapshot
-curl -XPUT "$cluster_url/_snapshot/$es_repo_name/$new_snapshot_name" -d '{
+curl -XPUT "$cluster_url/_snapshot/$es_repo_name/$new_snapshot_name" \
+  -H 'Content-Type: application/json' \
+  -d '{
   "indices": "pelias"
 }'
 

test/test_create_index.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 set -euo pipefail
 
-curl -XPUT "$cluster_url/twitter?pretty" -H 'Content-Type: application/json' -d'
-{
-    "settings" : {
-        "index" : {
-            "number_of_shards" : 3,
-            "number_of_replicas" : 2
-        }
+curl -XPUT "$cluster_url/twitter?pretty" \
+  -H 'Content-Type: application/json' \
+  -d '{
+  "settings" : {
+    "index" : {
+      "number_of_shards" : 3,
+      "number_of_replicas" : 2
     }
-}
-'
+  }
+}'
 
 curl -XDELETE "$cluster_url/twitter"