feat: [IAC-3149]: Use log keys from executable response when possible (#79)

* IAC-3149: use new log keys object when possible

* IAC-3149: revert tail to blob

Author: dwarren-dev

client/iacm-client.go

@@ -236,13 +236,22 @@ type ExecutionNodeAdjacencyList struct {
 }
 
 type ExecutionNode struct {
-	Uuid       string `json:"uuid,omitempty"`
-	SetupId    string `json:"setupId,omitempty"`
-	Name       string `json:"name,omitempty"`
-	Identifier string `json:"identifier,omitempty"`
-	StepType   string `json:"stepType,omitempty"`
-	Status     string `json:"status,omitempty"`
-	LogBaseKey string `json:"logBaseKey,omitempty"`
+	Uuid                string               `json:"uuid,omitempty"`
+	SetupId             string               `json:"setupId,omitempty"`
+	Name                string               `json:"name,omitempty"`
+	Identifier          string               `json:"identifier,omitempty"`
+	StepType            string               `json:"stepType,omitempty"`
+	Status              string               `json:"status,omitempty"`
+	LogBaseKey          string               `json:"logBaseKey,omitempty"`
+	ExecutableResponses []ExecutableResponse `json:"executableResponses"`
+}
+
+type ExecutableResponse struct {
+	Async Async `json:"async"`
+}
+
+type Async struct {
+	LogKeys []string `json:"logKeys"`
 }
 
 type ResponseMessage struct {

client/log-client.go

@@ -78,8 +78,9 @@ func (c *LogClient) Tail(ctx context.Context, key string) error {
 		line, err := formatLogs(event.Data)
 		if err != nil {
 			fmt.Println(err)
+		} else {
+			fmt.Println(line)
 		}
-		fmt.Println(line)
 	})
 	err = conn.Connect()
 	if err != nil {

iacm-plan.go

@@ -306,7 +306,7 @@ func (c *IacmCommand) walkStage(ctx context.Context, executionID string, stageNo
 				if lastStepNodeID != "" && !ok {
 					go func() {
 						fmt.Printf(startingStepMsg, stepNode.Name)
-						err := c.logClient.Tail(ctx, stepNode.LogBaseKey)
+						err := c.logClient.Tail(ctx, getLogKeyFromStepNode(stepNode))
 						if err != nil {
 							fmt.Println(err)
 						}
@@ -323,7 +323,7 @@ func (c *IacmCommand) walkStage(ctx context.Context, executionID string, stageNo
 				if lastStepNodeID != "" && !ok {
 					go func() {
 						fmt.Printf(startingStepMsg, stepNode.Name)
-						err := c.logClient.Blob(ctx, stepNode.LogBaseKey)
+						err := c.logClient.Blob(ctx, getLogKeyFromStepNode(stepNode))
 						if err != nil {
 							fmt.Println(err)
 						}
@@ -399,8 +399,17 @@ func isInactiveStageNode(status string) bool {
 }
 
 func shouldIgnoreStepType(stepType string) bool {
-	if stepType == "IntegrationStageStepPMS" || stepType == "NG_EXECUTION" || stepType == "IACMPrepareExecution" {
+	if stepType == "IACMIntegrationStageStepPMS" || stepType == "IntegrationStageStepPMS" || stepType == "NG_EXECUTION" || stepType == "IACMPrepareExecution" {
 		return true
 	}
 	return false
 }
+
+func getLogKeyFromStepNode(stepNode client.ExecutionNode) string {
+	if len(stepNode.ExecutableResponses) >= 1 {
+		if len(stepNode.ExecutableResponses[0].Async.LogKeys) >= 1 {
+			return stepNode.ExecutableResponses[0].Async.LogKeys[0]
+		}
+	}
+	return stepNode.LogBaseKey
+}