Merge pull request #1108 from ripienaar/prep_0_1_5

ripienaar · web-flow · commit 74fd7c740385 · 2024-07-29T20:56:26.000+03:00
Prepare release v0.1.5
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/klauspost/compress v1.17.9
 	github.com/mattn/go-isatty v0.0.20
-	github.com/nats-io/jsm.go v0.1.1
+	github.com/nats-io/jsm.go v0.1.2
 	github.com/nats-io/jwt/v2 v2.5.8
 	github.com/nats-io/nats-server/v2 v2.10.18
 	github.com/nats-io/nats.go v1.36.0
diff --git a/go.sum b/go.sum
@@ -77,6 +77,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nats-io/jsm.go v0.1.1 h1:6vjllz276SdC+3Fb3XI71p9B6toxkCruuB1K6unQEr0=
 github.com/nats-io/jsm.go v0.1.1/go.mod h1:cFz5wR1pW0zLFotntS4HA7V8Wm+sf8zpF+iQJHbsS6M=
+github.com/nats-io/jsm.go v0.1.2 h1:T4Fq88a03sPAPWYwrOLQ85oanYsC2Bs6517rUiWBMpQ=
+github.com/nats-io/jsm.go v0.1.2/go.mod h1:tnubE70CAKi5TNfQiq6XHFqWTuSIe1H7X4sDwfq6ZK8=
 github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE=
 github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
 github.com/nats-io/nats-server/v2 v2.10.18 h1:tRdZmBuWKVAFYtayqlBB2BuCHNGAQPvoQIXOKwU3WSM=
diff --git a/internal/audit/cluster_checks.go b/internal/audit/cluster_checks.go
@@ -221,7 +221,7 @@ func makeCheckClusterHighHAAssets(haAssetsThreshold int) checkFunc {
 func checkClusterNamesForWhitespace(reader *archive.Reader, examples *ExamplesCollection) (Outcome, error) {
 
 	for _, clusterName := range reader.GetClusterNames() {
-		if strings.Contains(clusterName, " ") {
+		if strings.ContainsAny(clusterName, " \n") {
 			examples.add("Cluster: %s", clusterName)
 		}
 	}
@@ -253,7 +253,7 @@ func checkLeafnodeServerNamesForWhitespace(r *archive.Reader, examples *Examples
 
 			for _, leaf := range serverLeafz.Leafs {
 				// check if leafnode name contains whitespace
-				if strings.Contains(leaf.Name, " ") {
+				if strings.ContainsAny(leaf.Name, " \n") {
 					leafnodesWithWhitespace[leaf.Name] = struct{}{}
 				}
 			}
diff --git a/internal/audit/server_checks.go b/internal/audit/server_checks.go
@@ -249,7 +249,7 @@ func checkJetStreamDomainsForWhitespace(r *archive.Reader, examples *ExamplesCol
 			}
 
 			// check if jetstream domain contains whitespace
-			if strings.Contains(serverJsz.Config.Domain, " ") {
+			if strings.ContainsAny(serverJsz.Config.Domain, " \n") {
 				examples.add("Cluster %s Server %s Domain %s", clusterName, serverName, serverJsz.Config.Domain)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ func makeCheckClusterHighHAAssets(haAssetsThreshold int) checkFunc {`
`221`	`221`	`func checkClusterNamesForWhitespace(reader archive.Reader, examples ExamplesCollection) (Outcome, error) {`
`222`	`222`
`223`	`223`	`for _, clusterName := range reader.GetClusterNames() {`
`224`		`- if strings.Contains(clusterName, " ") {`
	`224`	`+ if strings.ContainsAny(clusterName, " \n") {`
`225`	`225`	`examples.add("Cluster: %s", clusterName)`
`226`	`226`	`}`
`227`	`227`	`}`
`@@ -253,7 +253,7 @@ func checkLeafnodeServerNamesForWhitespace(r archive.Reader, examples Examples`
`253`	`253`
`254`	`254`	`for _, leaf := range serverLeafz.Leafs {`
`255`	`255`	`// check if leafnode name contains whitespace`
`256`		`- if strings.Contains(leaf.Name, " ") {`
	`256`	`+ if strings.ContainsAny(leaf.Name, " \n") {`
`257`	`257`	`leafnodesWithWhitespace[leaf.Name] = struct{}{}`
`258`	`258`	`}`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ func checkJetStreamDomainsForWhitespace(r archive.Reader, examples ExamplesCol`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`// check if jetstream domain contains whitespace`
`252`		`- if strings.Contains(serverJsz.Config.Domain, " ") {`
	`252`	`+ if strings.ContainsAny(serverJsz.Config.Domain, " \n") {`
`253`	`253`	`examples.add("Cluster %s Server %s Domain %s", clusterName, serverName, serverJsz.Config.Domain)`
`254`	`254`	`}`
`255`	`255`	`}`