From 44172142db319ecc742f0605fb6977ce2cbbd528 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Mon, 13 Jul 2020 18:46:18 +0200
Subject: [PATCH] [logstash] remove expected logstash host and name assertion
 (#724)

This commit remove expected Logstash host and name in Logstash tests with 6.x.

When using a headless service (4a6067e), Logstash 6.x use the full name of the service related to the namespace (ie: helm-logstash-default-logstash-0.helm-logstash-oss-logstash-headless.helm-charts-testing.svc.cluster.local). Keeping this test would require a hard coupling between the test and the namespace where it is running.
---
 logstash/examples/default/test/goss.yaml       | 2 --
 logstash/examples/elasticsearch/test/goss.yaml | 2 --
 logstash/examples/oss/test/goss.yaml           | 2 --
 logstash/examples/security/test/goss.yaml      | 2 --
 4 files changed, 8 deletions(-)

diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml
index 35b897737..62cba40f1 100644
--- a/logstash/examples/default/test/goss.yaml
+++ b/logstash/examples/default/test/goss.yaml
@@ -9,10 +9,8 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"host" : "helm-logstash-default-logstash-0"'
       - '"version" : "6.8.11"'
       - '"http_address" : "0.0.0.0:9600"'
-      - '"name" : "helm-logstash-default-logstash-0"'
 
 file:
   /usr/share/logstash/config/logstash.yml:
diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml
index 47838d9b3..fedc67ddf 100644
--- a/logstash/examples/elasticsearch/test/goss.yaml
+++ b/logstash/examples/elasticsearch/test/goss.yaml
@@ -21,10 +21,8 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"host" : "helm-logstash-elasticsearch-logstash-0"'
       - '"version" : "6.8.11"'
       - '"http_address" : "0.0.0.0:9600"'
-      - '"name" : "helm-logstash-elasticsearch-logstash-0"'
   http://elasticsearch-master:9200/_cat/indices:
     status: 200
     timeout: 2000
diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml
index 65756e91f..8d4b310aa 100644
--- a/logstash/examples/oss/test/goss.yaml
+++ b/logstash/examples/oss/test/goss.yaml
@@ -9,10 +9,8 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"host" : "helm-logstash-oss-logstash-0"'
       - '"version" : "6.8.11"'
       - '"http_address" : "0.0.0.0:9600"'
-      - '"name" : "helm-logstash-oss-logstash-0"'
 
 file:
   /usr/share/logstash/config/logstash.yml:
diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml
index 7a562d6d0..4d110b06c 100644
--- a/logstash/examples/security/test/goss.yaml
+++ b/logstash/examples/security/test/goss.yaml
@@ -21,10 +21,8 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"host" : "helm-logstash-security-logstash-0"'
       - '"version" : "6.8.11"'
       - '"http_address" : "0.0.0.0:9600"'
-      - '"name" : "helm-logstash-security-logstash-0"'
   https://security-master:9200/_cat/indices:
     status: 200
     timeout: 2000