refactoring

PeerDB-io · Nov 28, 2023 · b509be4 · b509be4
1 parent 7ddf16b
commit b509be4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -93,7 +93,7 @@ services:
       timeout: 5s
       retries: 30
     volumes:
-      - ./mirror-name-search.sh:/etc/temporal/entrypoint.sh
+      - ./scripts/mirror-name-search.sh:/etc/temporal/entrypoint.sh
 
   temporal-ui:
     container_name: temporal-ui

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -80,7 +80,7 @@ services:
       timeout: 5s
       retries: 30
     volumes:
-      - ./mirror-name-search.sh:/etc/temporal/entrypoint.sh
+      - ./scripts/mirror-name-search.sh:/etc/temporal/entrypoint.sh
 
   temporal-ui:
     container_name: temporal-ui

diff --git a/flow/cmd/handler.go b/flow/cmd/handler.go
@@ -130,7 +130,7 @@ func (h *FlowRequestHandler) CreateCDCFlow(
 		ID:        workflowID,
 		TaskQueue: h.peerflowTaskQueueID,
 		SearchAttributes: map[string]interface{}{
-			"MirrorName": cfg.FlowJobName,
+			shared.MirrorNameSearchAttribute: cfg.FlowJobName,
 		},
 	}
 
@@ -233,7 +233,7 @@ func (h *FlowRequestHandler) CreateQRepFlow(
 		ID:        workflowID,
 		TaskQueue: h.peerflowTaskQueueID,
 		SearchAttributes: map[string]interface{}{
-			"MirrorName": cfg.FlowJobName,
+			shared.MirrorNameSearchAttribute: cfg.FlowJobName,
 		},
 	}
 	if req.CreateCatalogEntry {
@@ -318,7 +318,7 @@ func (h *FlowRequestHandler) ShutdownFlow(
 		ID:        workflowID,
 		TaskQueue: h.peerflowTaskQueueID,
 		SearchAttributes: map[string]interface{}{
-			"MirrorName": req.FlowJobName,
+			shared.MirrorNameSearchAttribute: req.FlowJobName,
 		},
 	}
 	dropFlowHandle, err := h.temporalClient.ExecuteWorkflow(

diff --git a/flow/shared/constants.go b/flow/shared/constants.go
@@ -11,6 +11,8 @@ const (
 	CDCFlowSignalName     = "peer-flow-signal"
 )
 
+const MirrorNameSearchAttribute = "MirrorName"
+
 type CDCFlowSignal int64
 type ContextKey string
 

diff --git a/flow/workflows/cdc_flow.go b/flow/workflows/cdc_flow.go
@@ -190,7 +190,7 @@ func CDCFlowWorkflowWithConfig(
 		}
 
 		mirrorNameSearch := map[string]interface{}{
-			"MirrorName": cfg.FlowJobName,
+			shared.MirrorNameSearchAttribute: cfg.FlowJobName,
 		}
 
 		// start the SetupFlow workflow as a child workflow, and wait for it to complete
@@ -330,7 +330,7 @@ func CDCFlowWorkflowWithConfig(
 		}
 
 		mirrorNameSearch := map[string]interface{}{
-			"MirrorName": cfg.FlowJobName,
+			shared.MirrorNameSearchAttribute: cfg.FlowJobName,
 		}
 		// execute the sync flow as a child workflow
 		childSyncFlowOpts := workflow.ChildWorkflowOptions{

diff --git a/flow/workflows/qrep_flow.go b/flow/workflows/qrep_flow.go
@@ -207,7 +207,7 @@ func (q *QRepFlowExecution) startChildWorkflow(
 			MaximumAttempts: 20,
 		},
 		SearchAttributes: map[string]interface{}{
-			"MirrorName": q.config.FlowJobName,
+			shared.MirrorNameSearchAttribute: q.config.FlowJobName,
 		},
 	})
 

diff --git a/mirror-name-search.sh → scripts/mirror-name-search.sh b/mirror-name-search.sh → scripts/mirror-name-search.sh