[NET-7571]

- updating string
hashicorp · Feb 13, 2024 · f48de7f · f48de7f
1 parent 1416f6e
commit f48de7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/dependency/catalog_services.go b/dependency/catalog_services.go
@@ -122,11 +122,11 @@ func (d *CatalogServicesQuery) String() string {
 	if d.dc != "" {
 		name = name + "@" + d.dc
 	}
-	if d.namespace != "" {
-		name = name + "@" + d.namespace
-	}
 	if d.partition != "" {
-		name = name + "@" + d.partition
+		name = name + "@partition=" + d.partition
+	}
+	if d.namespace != "" {
+		name = name + "@ns=" + d.namespace
 	}
 
 	if len(name) == 0 {

diff --git a/dependency/catalog_services_test.go b/dependency/catalog_services_test.go
@@ -171,22 +171,22 @@ func TestCatalogServicesQuery_String(t *testing.T) {
 		{
 			"datacenter+namespace",
 			"?ns=bar@dc1",
-			"catalog.services(@dc1@bar)",
+			"catalog.services(@dc1@ns=bar)",
 		},
 		{
 			"datacenter+namespace+partition",
 			"?partition=foo&ns=bar@dc1",
-			"catalog.services(@dc1@bar@foo)",
+			"catalog.services(@dc1@partition=foo@ns=bar)",
 		},
 		{
 			"namespace+partition",
 			"?partition=foo&ns=bar",
-			"catalog.services(@bar@foo)",
+			"catalog.services(@partition=foo@ns=bar)",
 		},
 		{
 			"dc+partition",
 			"?partition=foo@dc1",
-			"catalog.services(@dc1@foo)",
+			"catalog.services(@dc1@partition=foo)",
 		},
 	}