[NET-9468, NET-9902] Differentiate the ListExportedServicesQuery dependency based on the provided partition

dependency/consul_exported_services.go

@@ -115,7 +115,7 @@ func (c *ListExportedServicesQuery) CanShare() bool {
 }
 
 func (c *ListExportedServicesQuery) String() string {
-	return exportedServicesEndpointLabel
+	return fmt.Sprintf("%s(%s)", exportedServicesEndpointLabel, c.partition)
 }
 
 func (c *ListExportedServicesQuery) Stop() {

dependency/dependency.go

@@ -54,7 +54,16 @@ const (
 type Dependency interface {
 	Fetch(*ClientSet, *QueryOptions) (interface{}, *ResponseMetadata, error)
 	CanShare() bool
+
+	// String is used to uniquely identify a dependency. If a dependency receives arguments and
+	// may be used multiple times w/ different args, then it should make sure to differentiate
+	// itself based on those args; otherwise, only one instance of the dependency will be created.
+	//
+	// For example: Calling the exportedServices func multiple times in a template for different
+	// partitions will result in the first partition provided being used repeatedly - regardless of the
+	// partition provided in later calls - if the partition name is not included in the output of String.
 	String() string
+
 	Stop()
 	Type() Type
 }

template/funcs_test.go

@@ -397,3 +397,21 @@ func Test_hmacSHA256Hex(t *testing.T) {
 		})
 	}
 }
+
+// Test_exportedServicesFunc verifies that calling exportedServices w/ a
+// different partition tracks an additional dependency
+func Test_exportedServicesFunc(t *testing.T) {
+	var used, missing dep.Set
+
+	f := exportedServicesFunc(NewBrain(), &used, &missing)
+
+	_, err := f("default")
+	require.NoError(t, err)
+	assert.Equal(t, "list.exportedServices(default)", used.String())
+	assert.Equal(t, "list.exportedServices(default)", missing.String())
+
+	_, err = f("ap1")
+	require.NoError(t, err)
+	assert.Equal(t, "list.exportedServices(default), list.exportedServices(ap1)", used.String())
+	assert.Equal(t, "list.exportedServices(default), list.exportedServices(ap1)", missing.String())
+}