Allow dynamic config filter by namespace or task queue name only (#2858)

temporalio · May 20, 2022 · 2758e29 · 2758e29
1 parent 150516a
commit 2758e29
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/common/dynamicconfig/config.go b/common/dynamicconfig/config.go
@@ -150,6 +150,15 @@ func getFilterMap(opts ...FilterOption) map[Filter]interface{} {
 	return m
 }
 
+func getFilterMapsForTaskQueue(namespace string, taskQueue string, taskType enumspb.TaskQueueType) []map[Filter]interface{} {
+	return []map[Filter]interface{}{
+		getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue), TaskTypeFilter(taskType)),
+		getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue)),
+		getFilterMap(NamespaceFilter(namespace)),
+		getFilterMap(TaskQueueFilter(taskQueue)),
+	}
+}
+
 // GetIntProperty gets property and asserts that it's an integer
 func (c *Collection) GetIntProperty(key Key, defaultValue int) IntPropertyFn {
 	return func(opts ...FilterOption) int {
@@ -180,10 +189,7 @@ func (c *Collection) GetIntPropertyFilteredByTaskQueueInfo(key Key, defaultValue
 		val := defaultValue
 		var err error
 
-		filterMaps := []map[Filter]interface{}{
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue), TaskTypeFilter(taskType)),
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue)),
-		}
+		filterMaps := getFilterMapsForTaskQueue(namespace, taskQueue, taskType)
 
 		for _, filterMap := range filterMaps {
 			val, err = c.client.GetIntValue(
@@ -266,10 +272,7 @@ func (c *Collection) GetFloatPropertyFilteredByTaskQueueInfo(key Key, defaultVal
 		val := defaultValue
 		var err error
 
-		filterMaps := []map[Filter]interface{}{
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue), TaskTypeFilter(taskType)),
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue)),
-		}
+		filterMaps := getFilterMapsForTaskQueue(namespace, taskQueue, taskType)
 
 		for _, filterMap := range filterMaps {
 			val, err = c.client.GetFloatValue(
@@ -332,10 +335,7 @@ func (c *Collection) GetDurationPropertyFilteredByTaskQueueInfo(key Key, default
 		val := defaultValue
 		var err error
 
-		filterMaps := []map[Filter]interface{}{
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue), TaskTypeFilter(taskType)),
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue)),
-		}
+		filterMaps := getFilterMapsForTaskQueue(namespace, taskQueue, taskType)
 
 		for _, filterMap := range filterMaps {
 			val, err = c.client.GetDurationValue(
@@ -462,10 +462,7 @@ func (c *Collection) GetBoolPropertyFilteredByTaskQueueInfo(key Key, defaultValu
 		val := defaultValue
 		var err error
 
-		filterMaps := []map[Filter]interface{}{
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue), TaskTypeFilter(taskType)),
-			getFilterMap(NamespaceFilter(namespace), TaskQueueFilter(taskQueue)),
-		}
+		filterMaps := getFilterMapsForTaskQueue(namespace, taskQueue, taskType)
 
 		for _, filterMap := range filterMaps {
 			val, err = c.client.GetBoolValue(

diff --git a/common/dynamicconfig/config/testConfig.yaml b/common/dynamicconfig/config/testConfig.yaml
@@ -50,6 +50,9 @@ testGetIntPropertyKey:
   constraints:
     namespace: global-samples-namespace
     taskQueueName: test-tq
+- value: 1005
+  constraints:
+    taskQueueName: other-test-tq
 testGetMapPropertyKey:
 - value:
     key1: "1"

diff --git a/common/dynamicconfig/file_based_client_test.go b/common/dynamicconfig/file_based_client_test.go
@@ -179,6 +179,16 @@ func (s *fileBasedClientSuite) TestGetIntValue_FilteredByActivityTaskQueueInfo()
 	s.Equal(expectedValue, v)
 }
 
+func (s *fileBasedClientSuite) TestGetIntValue_FilteredByTaskQueueNameOnly() {
+	expectedValue := 1005
+	filters := map[Filter]interface{}{
+		TaskQueueName: "other-test-tq",
+	}
+	v, err := s.client.GetIntValue(testGetIntPropertyKey, filters, 0)
+	s.NoError(err)
+	s.Equal(expectedValue, v)
+}
+
 func (s *fileBasedClientSuite) TestGetFloatValue() {
 	v, err := s.client.GetFloatValue(testGetFloat64PropertyKey, nil, 1)
 	s.NoError(err)