Remove deprecated _doc from mapping to support ES8

Author: rowanseymour

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        elastic-port: [9207, 9208]
+        elastic-host: ["elastic7:9207", "elastic8:9208"]
 
     services:
       postgres:
@@ -45,7 +45,7 @@ jobs:
 
       - name: Setup environment
         run: |
-          echo "INDEXER_ELASTIC_URL=http://localhost:${{ matrix.elastic-port }}" >> "$GITHUB_ENV"
+          echo "INDEXER_ELASTIC_URL=http://${{ matrix.elastic-host }}" >> "$GITHUB_ENV"
 
       - name: Run tests
         run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...

indexers/contacts.index.json

@@ -74,119 +74,117 @@
         }
     },
     "mappings": {
-        "_doc": {
-            "_routing": {
-                "required": true
+        "_routing": {
+            "required": true
+        },
+        "properties": {
+            "uuid": {
+                "type": "keyword"
             },
-            "properties": {
-                "uuid": {
-                    "type": "keyword"
-                },
-                "name": {
-                    "type": "text",
-                    "analyzer": "prefix",
-                    "search_analyzer": "name_search",
-                    "fields": {
-                        "keyword": {
-                            "type": "keyword",
-                            "normalizer": "lowercase"
-                        }
-                    }
-                },
-                "status": {
-                    "type": "keyword"
-                },
+            "name": {
+                "type": "text",
+                "analyzer": "prefix",
+                "search_analyzer": "name_search",
                 "fields": {
-                    "type": "nested",
-                    "properties": {
-                        "field": {
-                            "type": "keyword"
-                        },
-                        "text": {
-                            "type": "keyword",
-                            "normalizer": "lowercase"
-                        },
-                        "number": {
-                            "type": "scaled_float",
-                            "scaling_factor": 10000,
-                            "ignore_malformed": true
-                        },
-                        "datetime": {
-                            "type": "date"
-                        },
-                        "state": {
-                            "type": "text",
-                            "analyzer": "locations"
-                        },
-                        "state_keyword": {
-                            "type": "keyword",
-                            "normalizer": "lowercase"
-                        },
-                        "district": {
-                            "type": "text",
-                            "analyzer": "locations"
-                        },
-                        "district_keyword": {
-                            "type": "keyword",
-                            "normalizer": "lowercase"
-                        },
-                        "ward": {
-                            "type": "text",
-                            "analyzer": "locations"
-                        },
-                        "ward_keyword": {
-                            "type": "keyword",
-                            "normalizer": "lowercase"
-                        }
+                    "keyword": {
+                        "type": "keyword",
+                        "normalizer": "lowercase"
                     }
-                },
-                "urns": {
-                    "type": "nested",
-                    "properties": {
-                        "path": {
-                            "type": "text",
-                            "analyzer": "trigrams",
-                            "fields": {
-                                "keyword": {
-                                    "type": "keyword",
-                                    "normalizer": "lowercase"
-                                }
+                }
+            },
+            "status": {
+                "type": "keyword"
+            },
+            "fields": {
+                "type": "nested",
+                "properties": {
+                    "field": {
+                        "type": "keyword"
+                    },
+                    "text": {
+                        "type": "keyword",
+                        "normalizer": "lowercase"
+                    },
+                    "number": {
+                        "type": "scaled_float",
+                        "scaling_factor": 10000,
+                        "ignore_malformed": true
+                    },
+                    "datetime": {
+                        "type": "date"
+                    },
+                    "state": {
+                        "type": "text",
+                        "analyzer": "locations"
+                    },
+                    "state_keyword": {
+                        "type": "keyword",
+                        "normalizer": "lowercase"
+                    },
+                    "district": {
+                        "type": "text",
+                        "analyzer": "locations"
+                    },
+                    "district_keyword": {
+                        "type": "keyword",
+                        "normalizer": "lowercase"
+                    },
+                    "ward": {
+                        "type": "text",
+                        "analyzer": "locations"
+                    },
+                    "ward_keyword": {
+                        "type": "keyword",
+                        "normalizer": "lowercase"
+                    }
+                }
+            },
+            "urns": {
+                "type": "nested",
+                "properties": {
+                    "path": {
+                        "type": "text",
+                        "analyzer": "trigrams",
+                        "fields": {
+                            "keyword": {
+                                "type": "keyword",
+                                "normalizer": "lowercase"
                             }
-                        },
-                        "scheme": {
-                            "type": "keyword",
-                            "normalizer": "lowercase"
                         }
+                    },
+                    "scheme": {
+                        "type": "keyword",
+                        "normalizer": "lowercase"
                     }
-                },
-                "group_ids": {
-                    "type": "keyword"
-                },
-                "flow_id": {
-                    "type": "integer"
-                },
-                "flow_history_ids": {
-                    "type": "integer"
-                },
-                "tickets": {
-                    "type": "integer"
-                },
-                "language": {
-                    "type": "keyword",
-                    "normalizer": "lowercase"
-                },
-                "modified_on": {
-                    "type": "date"
-                },
-                "created_on": {
-                    "type": "date"
-                },
-                "modified_on_mu": {
-                    "type": "long"
-                },
-                "last_seen_on": {
-                    "type": "date"
                 }
+            },
+            "group_ids": {
+                "type": "keyword"
+            },
+            "flow_id": {
+                "type": "integer"
+            },
+            "flow_history_ids": {
+                "type": "integer"
+            },
+            "tickets": {
+                "type": "integer"
+            },
+            "language": {
+                "type": "keyword",
+                "normalizer": "lowercase"
+            },
+            "modified_on": {
+                "type": "date"
+            },
+            "created_on": {
+                "type": "date"
+            },
+            "modified_on_mu": {
+                "type": "long"
+            },
+            "last_seen_on": {
+                "type": "date"
             }
         }
     }