Merge branch 'main' into jira/lwolczynski/IWF-105

indeedeng · Nov 18, 2024 · 397e211 · 397e211
2 parents 2afa674 + aa564e1
commit 397e211
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/docker-compose/init-ci-temporal.sh b/docker-compose/init-ci-temporal.sh
@@ -30,8 +30,12 @@ for run in {1..120}; do
   sleep 0.1
   temporal  operator search-attribute  create --name CustomStringField --type Text
   sleep 0.1
+  temporal  operator search-attribute  create --name CustomKeywordArrayField --type KeywordList
+  sleep 0.1
+  temporal  operator search-attribute  create --name CustomTextField --type Text
+  sleep 0.1
 
-  if checkExists "IwfWorkflowType" ] && checkExists "IwfGlobalWorkflowVersion" && checkExists "IwfExecutingStateIds" && checkExists "CustomKeywordField" && checkExists "CustomIntField" && checkExists "CustomBoolField" && checkExists "CustomDoubleField" && checkExists "CustomDatetimeField" && checkExists "CustomStringField" ] ; then
+  if checkExists "IwfWorkflowType" ] && checkExists "IwfGlobalWorkflowVersion" && checkExists "IwfExecutingStateIds" && checkExists "CustomKeywordField" && checkExists "CustomIntField" && checkExists "CustomBoolField" && checkExists "CustomDoubleField" && checkExists "CustomDatetimeField" && checkExists "CustomStringField" && checkExists "CustomKeywordArrayField" ] ; then
     echo "All search attributes are registered"
     break
   fi

diff --git a/docker-compose/init-compose.sh b/docker-compose/init-compose.sh
@@ -19,7 +19,9 @@ for run in {1..60}; do
   sleep 0.1 
   temporal  operator search-attribute  create --name IwfExecutingStateIds --type KeywordList
   sleep 0.1
-  if checkExists "IwfWorkflowType" ] && checkExists "IwfGlobalWorkflowVersion" && checkExists "IwfExecutingStateIds" ] ; then
+  temporal  operator search-attribute  create --name CustomKeywordArrayField --type KeywordList
+  sleep 0.1
+  if checkExists "IwfWorkflowType" ] && checkExists "IwfGlobalWorkflowVersion" && checkExists "IwfExecutingStateIds" && checkExists "CustomKeywordArrayField" ] ; then
       echo "All search attributes are registered"
       break
     fi

diff --git a/integ/set_search_attributes_test.go b/integ/set_search_attributes_test.go
@@ -60,6 +60,11 @@ func TestSetSearchAttributes(t *testing.T) {
 			Key:         iwfidl.PtrString(persistence.TestSearchAttributeKeywordKey),
 			ValueType:   ptr.Any(iwfidl.KEYWORD),
 			StringValue: iwfidl.PtrString(persistence.TestSearchAttributeKeywordValue1),
+		},
+		iwfidl.SearchAttribute{
+			Key:              iwfidl.PtrString(persistence.TestSearchAttributeKeywordArrayKey),
+			ValueType:        ptr.Any(iwfidl.KEYWORD_ARRAY),
+			StringArrayValue: []string{persistence.TestSearchAttributeKeywordValue2, persistence.TestSearchAttributeKeywordValue1},
 		})
 
 	setReq := apiClient.DefaultApi.ApiV1WorkflowSearchattributesSetPost(context.Background())
@@ -84,6 +89,10 @@ func TestSetSearchAttributes(t *testing.T) {
 				Key:       iwfidl.PtrString(persistence.TestSearchAttributeKeywordKey),
 				ValueType: ptr.Any(iwfidl.KEYWORD),
 			},
+			{
+				Key:       iwfidl.PtrString(persistence.TestSearchAttributeKeywordArrayKey),
+				ValueType: ptr.Any(iwfidl.KEYWORD_ARRAY),
+			},
 		}}).Execute()
 	panicAtHttpError(err, httpRespGet)
 

diff --git a/integ/workflow/persistence/routers.go b/integ/workflow/persistence/routers.go
@@ -23,13 +23,14 @@ const (
 	TestSearchAttributeKeywordValue1 = "keyword-value1"
 	TestSearchAttributeKeywordValue2 = "keyword-value2"
 
-	TestSearchAttributeIntKey      = "CustomIntField"
-	TestSearchAttributeBoolKey     = "CustomBoolField"
-	TestSearchAttributeDoubleKey   = "CustomDoubleField"
-	TestSearchAttributeDatetimeKey = "CustomDatetimeField"
-	TestSearchAttributeTextKey     = "CustomStringField"
-	TestSearchAttributeIntValue1   = 1
-	TestSearchAttributeIntValue2   = 2
+	TestSearchAttributeKeywordArrayKey = "CustomKeywordArrayField"
+	TestSearchAttributeIntKey          = "CustomIntField"
+	TestSearchAttributeBoolKey         = "CustomBoolField"
+	TestSearchAttributeDoubleKey       = "CustomDoubleField"
+	TestSearchAttributeDatetimeKey     = "CustomDatetimeField"
+	TestSearchAttributeTextKey         = "CustomStringField"
+	TestSearchAttributeIntValue1       = 1
+	TestSearchAttributeIntValue2       = 2
 )
 
 var TestDataObjectVal1 = iwfidl.EncodedObject{