Improve handling of Index templates across ES versions.

voxpupuli · Jun 25, 2020 · b9eba78 · b9eba78
1 parent ab6c1be
commit b9eba78
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 117 deletions.
diff --git a/spec/fixtures/templates/post_6.0.json → spec/fixtures/templates/6.x.json b/spec/fixtures/templates/post_6.0.json → spec/fixtures/templates/6.x.json
@@ -56,4 +56,4 @@
       }
     }
   }
-}
+}
diff --git a/spec/fixtures/templates/7.x.json b/spec/fixtures/templates/7.x.json
@@ -0,0 +1,42 @@
+{
+  "index_patterns": [ "logstash-*" ],
+  "version": 123,
+  "settings": {
+    "index": {
+      "refresh_interval": "5s",
+      "analysis": {
+        "analyzer": {
+          "default": {
+            "type": "standard",
+            "stopwords": "_none_"
+          }
+        }
+      }
+    }
+  },
+  "mappings": {
+    "dynamic_templates": [
+      {
+        "string_fields": {
+          "match": "*",
+          "match_mapping_type": "string",
+          "mapping": {
+            "type": "multi_field",
+            "fields": {
+              "{name}": {
+                "type": "text",
+                "index": "analyzed",
+                "omit_norms": true
+              },
+              "raw": {
+                "type ": "text",
+                "index": "not_analyzed",
+                "ignore_above": 256
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/spec/fixtures/templates/post_8.0.json b/spec/fixtures/templates/post_8.0.json
@@ -1,57 +1,30 @@
 {
-  "index_patterns": [ "logstash-*" ],
-  "version": 123,
-  "settings": {
-    "index": {
-      "refresh_interval": "5s",
-      "analysis": {
-        "analyzer": {
-          "default": {
-            "type": "standard",
-            "stopwords": "_none_"
-          }
-        }
-      }
-    }
-  },
-  "mappings": {
-    "dynamic_templates": [
-      {
-        "string_fields": {
-          "match": "*",
-          "match_mapping_type": "string",
-          "mapping": {
-            "type": "multi_field",
-            "fields": {
-              "{name}": {
-                "type": "text",
-                "index": "analyzed",
-                "omit_norms": true
-              },
-              "raw": {
-                "type ": "text",
-                "index": "not_analyzed",
-                "ignore_above": 256
-              }
-            }
-          }
-        }
-      }
-    ],
-    "properties": {
-      "@version": {
-        "type": "text",
-        "index": false
+  "index_patterns": ["te*", "bar*"],
+  "template": {
+    "settings": {
+      "number_of_shards": 1
+    },
+    "mappings": {
+      "_source": {
+        "enabled": false
       },
-      "geoip": {
-        "type": "object",
-        "dynamic": true,
-        "properties": {
-          "location": {
-            "type": "geo_point"
-          }
+      "properties": {
+        "host_name": {
+          "type": "keyword"
+        },
+        "created_at": {
+          "type": "date",
+          "format": "EEE MMM dd HH:mm:ss Z yyyy"
         }
       }
+    },
+    "aliases": {
+      "mydata": { }
     }
+  },
+  "priority": 10,
+  "version": 3,
+  "_meta": {
+    "description": "my custom"
   }
-}
+}
diff --git a/spec/fixtures/templates/pre_6.0.json b/spec/fixtures/templates/pre_6.0.json
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -36,12 +36,12 @@
     v[:elasticsearch_full_version] = ENV['ELASTICSEARCH_VERSION'] || v[:snapshot_version]
     v[:elasticsearch_major_version] = v[:elasticsearch_full_version].split('.').first.to_i
     v[:elasticsearch_package] = {}
-    v[:template] = if v[:elasticsearch_major_version] < 6
-                     JSON.load(File.new('spec/fixtures/templates/pre_6.0.json'))
+    v[:template] = if v[:elasticsearch_major_version] == 6
+                     JSON.load(File.new('spec/fixtures/templates/6.x.json'))
                    elsif v[:elasticsearch_major_version] >= 8
                      JSON.load(File.new('spec/fixtures/templates/post_8.0.json'))
                    else
-                     JSON.load(File.new('spec/fixtures/templates/post_6.0.json'))
+                     JSON.load(File.new('spec/fixtures/templates/7.x.json'))
                    end
     v[:template] = Puppet_X::Elastic.deep_to_i(Puppet_X::Elastic.deep_to_s(v[:template]))
     v[:pipeline] = JSON.load(File.new('spec/fixtures/pipelines/example.json'))

diff --git a/spec/unit/type/elasticsearch_template_spec.rb b/spec/unit/type/elasticsearch_template_spec.rb
@@ -115,7 +115,7 @@ def deep_stringify(obj)
           obj.to_s
         end
       end
-      json = JSON.parse(File.read('spec/fixtures/templates/post_6.0.json'))
+      json = JSON.parse(File.read('spec/fixtures/templates/6.x.json'))
 
       is_template = described_class.new(
         :name => resource_name,
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,4 +56,4 @@ @@
           }
         }
       }
-    }
+    }