Net 7571

dependency/catalog_services.go

@@ -71,8 +71,6 @@ func (d *CatalogServicesQuery) Fetch(clients *ClientSet, opts *QueryOptions) (in
 	default:
 	}
 
-	// this overrides the query params present in the query with ones present while creating the query
-	// see bug [https://github.com/hashicorp/consul-template/pull/1842#issuecomment-1915723565]
 	// default to the query params present while creating NewCatalogServicesQuery
 	// and then merge with the query params present in the query
 	defaultOpts := &QueryOptions{
@@ -120,10 +118,22 @@ func (d *CatalogServicesQuery) CanShare() bool {
 
 // String returns the human-friendly version of this dependency.
 func (d *CatalogServicesQuery) String() string {
+	var name string
 	if d.dc != "" {
-		return fmt.Sprintf("catalog.services(@%s)", d.dc)
+		name = name + "@" + d.dc
 	}
-	return "catalog.services"
+	if d.namespace != "" {
+		name = name + "@" + d.namespace
+	}
+	if d.partition != "" {
+		name = name + "@" + d.partition
+	}
+
+	if len(name) == 0 {
+		return "catalog.services"
+	}
+
+	return fmt.Sprintf("catalog.services(%s)", name)
 }
 
 // Stop halts the dependency's fetch function.

dependency/catalog_services_test.go

@@ -168,6 +168,26 @@ func TestCatalogServicesQuery_String(t *testing.T) {
 			"@dc1",
 			"catalog.services(@dc1)",
 		},
+		{
+			"datacenter+namespace",
+			"?ns=bar@dc1",
+			"catalog.services(@dc1@bar)",
+		},
+		{
+			"datacenter+namespace+partition",
+			"?partition=foo&ns=bar@dc1",
+			"catalog.services(@dc1@bar@foo)",
+		},
+		{
+			"namespace+partition",
+			"?partition=foo&ns=bar",
+			"catalog.services(@bar@foo)",
+		},
+		{
+			"dc+partition",
+			"?partition=foo@dc1",
+			"catalog.services(@dc1@foo)",
+		},
 	}
 
 	for i, tc := range cases {