Merge pull request #106 from github/hoenn/add-get-shard-recovery-with…

…-params

Add GetShardRecoveryWithQueryParams

.github/workflows/golangci-lint.yml

@@ -16,10 +16,13 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v2
+      - name: Set up Go 1.15
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.15'
       - uses: actions/checkout@v2
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.7.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: v1.46.2
@@ -41,4 +44,4 @@ jobs:
           # skip-pkg-cache: true
 
           # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true
+          # skip-build-cache: true

.golangci.yaml

@@ -13,7 +13,6 @@ linters-settings:
 
 linters:
   enable:
-    - deadcode
     - depguard
     - errcheck
     - exportloopref
@@ -30,11 +29,9 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - structcheck
     - typecheck
     - unconvert
     - unused
-    - varcheck
   disable:
     - gochecknoglobals # we allow global variables in packages
     - gochecknoinits   # we allow inits in packages

es.go

@@ -1511,6 +1511,59 @@ func (c *Client) GetShardRecovery(nodes []string, onlyActive bool) ([]ShardRecov
 	return filteredRecoveries, nil
 }
 
+// Get details regarding shard recovery operations across a set of cluster nodes sending the desired query parameters
+//
+// Use case: You can view the shard recovery progress of the cluster with the bytes=b parameter.
+func (c *Client) GetShardRecoveryWithQueryParams(nodes []string, params map[string]string) ([]ShardRecovery, error) {
+	var allRecoveries []ShardRecovery
+	uri := "_cat/recovery"
+
+	queryStrings := []string{}
+	for param, val := range params {
+		queryStrings = append(queryStrings, fmt.Sprintf("%s=%s", param, val))
+	}
+
+	uri = fmt.Sprintf("%s?%s", uri, strings.Join(queryStrings, "&"))
+
+	req := c.buildGetRequest(uri)
+	err := handleErrWithStruct(req, &allRecoveries)
+
+	if err != nil {
+		return nil, err
+	}
+
+	// No nodes passed, so return all shards
+	if len(nodes) == 0 {
+		return allRecoveries, nil
+	}
+
+	var filteredRecoveries []ShardRecovery
+	nodeRegexps := make([]*regexp.Regexp, 0, len(nodes))
+
+	for _, node := range nodes {
+		nodeRegexp, err := regexp.Compile(node)
+		if err != nil {
+			return nil, err
+		}
+		nodeRegexps = append(nodeRegexps, nodeRegexp)
+	}
+
+	for _, shard := range allRecoveries {
+		for _, nodeRegexp := range nodeRegexps {
+			// Support regexp matching of node name
+			matchesSource := nodeRegexp.MatchString(shard.SourceNode)
+			matchesTarget := nodeRegexp.MatchString(shard.TargetNode)
+
+			// Return if either source node or target node matches
+			if matchesSource || matchesTarget {
+				filteredRecoveries = append(filteredRecoveries, shard)
+			}
+		}
+	}
+
+	return filteredRecoveries, nil
+}
+
 // GetDuration gets the total duration of a snapshot
 func (s *Snapshot) GetDuration() int {
 	if s.DurationMillis > 0 {