From 1b34346fa0a2447449e36ffa5fea026f8a8c8842 Mon Sep 17 00:00:00 2001 From: lwolczynski Date: Wed, 13 Nov 2024 14:44:59 -0600 Subject: [PATCH] IWF-254: Remove default assignments --- service/api/service.go | 22 +++++----------------- service/const.go | 5 ----- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/service/api/service.go b/service/api/service.go index 55d144f9..7bb14dc2 100644 --- a/service/api/service.go +++ b/service/api/service.go @@ -123,8 +123,6 @@ func (s *serviceImpl) ApiV1WorkflowStartPost( } } - fmt.Print(workflowConfig) - if startOptions.GetUseMemoForDataAttributes() { useMemoForDAs = true workflowOptions.Memo[service.UseMemoForDataAttributesKey] = iwfidl.EncodedObject{ @@ -196,29 +194,19 @@ func (s *serviceImpl) ApiV1WorkflowStartPost( } func overrideWorkflowConfig(configOverride iwfidl.WorkflowConfig, workflowConfig *iwfidl.WorkflowConfig) { - if configOverride.ExecutingStateIdMode == nil { - workflowConfig.ExecutingStateIdMode = ptr.Any(service.DefaultExecutingStateIdMode) - } else { + if configOverride.ExecutingStateIdMode != nil { workflowConfig.ExecutingStateIdMode = configOverride.ExecutingStateIdMode } - if configOverride.ContinueAsNewThreshold == nil { - workflowConfig.ContinueAsNewThreshold = iwfidl.PtrInt32(service.DefaultContinueAsNewThreshold) - } else { + if configOverride.ContinueAsNewThreshold != nil { workflowConfig.ContinueAsNewThreshold = configOverride.ContinueAsNewThreshold } - if configOverride.ContinueAsNewPageSizeInBytes == nil { - workflowConfig.ContinueAsNewPageSizeInBytes = iwfidl.PtrInt32(service.DefaultContinueAsNewPageSizeInBytes) - } else { + if configOverride.ContinueAsNewPageSizeInBytes != nil { workflowConfig.ContinueAsNewPageSizeInBytes = configOverride.ContinueAsNewPageSizeInBytes } - if configOverride.DisableSystemSearchAttribute == nil { - workflowConfig.DisableSystemSearchAttribute = iwfidl.PtrBool(false) - } else { + if configOverride.DisableSystemSearchAttribute != nil { workflowConfig.DisableSystemSearchAttribute = configOverride.DisableSystemSearchAttribute } - if configOverride.OptimizeActivity == nil { - workflowConfig.OptimizeActivity = iwfidl.PtrBool(false) - } else { + if configOverride.OptimizeActivity != nil { workflowConfig.OptimizeActivity = configOverride.OptimizeActivity } } diff --git a/service/const.go b/service/const.go index e2835ba2..a7014884 100644 --- a/service/const.go +++ b/service/const.go @@ -1,7 +1,5 @@ package service -import "github.com/indeedeng/iwf/gen/iwfidl" - type ( BackendType string ) @@ -9,10 +7,7 @@ type ( const ( EnvNameDebugMode = "DEBUG_MODE" - // Defaults for WorkflowConfig excluding booleans DefaultContinueAsNewPageSizeInBytes = 1024 * 1024 - DefaultContinueAsNewThreshold = 100 - DefaultExecutingStateIdMode = iwfidl.ENABLED_FOR_STATES_WITH_WAIT_UNTIL // below are special unofficial code for special use case