Add test cases to unit test

ycombinator · ycombinator · commit 08d22a579e74 · 2020-09-02T13:14:49.000-07:00
diff --git a/metricbeat/module/elasticsearch/index/index.go b/metricbeat/module/elasticsearch/index/index.go
@@ -19,6 +19,7 @@ package index
 
 import (
 	"net/url"
+	"strings"
 
 	"github.com/pkg/errors"
 
@@ -37,9 +38,9 @@ func init() {
 }
 
 const (
-	statsMetrics         = "docs,fielddata,indexing,merge,search,segments,store,refresh,query_cache,request_cache"
-	expandWildcardsParam = "expand_wildcards"
-	statsPath            = "/_stats/" + statsMetrics + "?filter_path=indices&" + expandWildcardsParam + "=open"
+	statsMetrics    = "docs,fielddata,indexing,merge,search,segments,store,refresh,query_cache,request_cache"
+	expandWildcards = "expand_wildcards=open"
+	statsPath       = "/_stats/" + statsMetrics + "?filter_path=indices&" + expandWildcards
 
 	bulkSuffix   = ",bulk"
 	hiddenSuffix = ",hidden"
@@ -127,9 +128,7 @@ func getServicePath(esVersion common.Version) (string, error) {
 	}
 
 	if !esVersion.LessThan(elasticsearch.ExpandWildcardsHiddenAvailableVersion) {
-		ew := u.Query().Get(expandWildcardsParam)
-		ew += hiddenSuffix
-		u.Query().Set(expandWildcardsParam, ew)
+		u.RawQuery = strings.Replace(u.RawQuery, expandWildcards, expandWildcards+hiddenSuffix, 1)
 	}
 
 	return u.String(), nil
diff --git a/metricbeat/module/elasticsearch/index/index_test.go b/metricbeat/module/elasticsearch/index/index_test.go
@@ -27,18 +27,29 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestGetServiceURI(t *testing.T) {
+func TestGetServiceURIExpectedPath(t *testing.T) {
+	path770 := strings.Replace(statsPath, expandWildcards, expandWildcards+hiddenSuffix, 1)
+	path800 := strings.Replace(path770, statsMetrics, statsMetrics+bulkSuffix, 1)
+
 	tests := map[string]struct {
 		esVersion    *common.Version
 		expectedPath string
 	}{
 		"bulk_stats_unavailable": {
-			esVersion:    common.MustNewVersion("7.9.0"),
+			esVersion:    common.MustNewVersion("7.6.0"),
 			expectedPath: statsPath,
 		},
 		"bulk_stats_available": {
 			esVersion:    common.MustNewVersion("8.0.0"),
-			expectedPath: strings.Replace(statsPath, statsMetrics, statsMetrics+",bulk", 1),
+			expectedPath: path800,
+		},
+		"expand_wildcards_hidden_unavailable": {
+			esVersion:    common.MustNewVersion("7.6.0"),
+			expectedPath: statsPath,
+		},
+		"expand_wildcards_hidden_available": {
+			esVersion:    common.MustNewVersion("7.7.0"),
+			expectedPath: path770,
 		},
 	}
 
