From 19ce2b53f6d891b2723d0c01b1d7dc0cd7bbd412 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Fri, 23 Feb 2024 19:15:11 +0000 Subject: [PATCH 1/3] Added logging of milestone to progress reporting This should improve the output for CI --- cmd/changes_get_change.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/cmd/changes_get_change.go b/cmd/changes_get_change.go index 65f54342..65acb78c 100644 --- a/cmd/changes_get_change.go +++ b/cmd/changes_get_change.go @@ -122,8 +122,25 @@ fetch: } if riskRes.Msg.GetChangeRiskMetadata().GetRiskCalculationStatus().GetStatus() == sdp.RiskCalculationStatus_STATUS_INPROGRESS { - log.WithContext(ctx).WithField("status", riskRes.Msg.GetChangeRiskMetadata().GetRiskCalculationStatus().GetStatus().String()).Info("waiting for risk calculation") - time.Sleep(10 * time.Second) + // Extract the currently running milestone if you can + milestones := riskRes.Msg.GetChangeRiskMetadata().GetRiskCalculationStatus().GetProgressMilestones() + var currentMilestone string + for _, milestone := range milestones { + if milestone == nil { + continue + } + + if milestone.Status == sdp.RiskCalculationStatus_ProgressMilestone_STATUS_INPROGRESS { + currentMilestone = milestone.GetDescription() + } + } + + log.WithContext(ctx).WithFields(log.Fields{ + "status": riskRes.Msg.GetChangeRiskMetadata().GetRiskCalculationStatus().GetStatus().String(), + "milestone": currentMilestone, + }).Info("Waiting for risk calculation") + + time.Sleep(3 * time.Second) // retry } else { // it's done (or errored) From 6a2c80fb8161088cb4fa10bcaee50357f3071b3d Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Sat, 24 Feb 2024 11:23:44 +0000 Subject: [PATCH 2/3] Update mappings --- cmd/datamaps/awssource.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/datamaps/awssource.go b/cmd/datamaps/awssource.go index f5432c0a..02d51c94 100644 --- a/cmd/datamaps/awssource.go +++ b/cmd/datamaps/awssource.go @@ -905,6 +905,14 @@ var AwssourceData = map[string][]TfMapData{ Scope: "*", }, }, + "aws_sqs_queue": { + { + Type: "sqs-queue", + Method: sdp.QueryMethod_GET, + QueryField: "id", + Scope: "*", + }, + }, "aws_subnet": { { Type: "ec2-subnet", From c88a954519adbd0aa9b0756d60ff4fdb4bc7cdd2 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Sat, 24 Feb 2024 11:26:25 +0000 Subject: [PATCH 3/3] Fix lint complaints --- cmd/changes_get_change.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/changes_get_change.go b/cmd/changes_get_change.go index 65acb78c..438ba407 100644 --- a/cmd/changes_get_change.go +++ b/cmd/changes_get_change.go @@ -130,7 +130,7 @@ fetch: continue } - if milestone.Status == sdp.RiskCalculationStatus_ProgressMilestone_STATUS_INPROGRESS { + if milestone.GetStatus() == sdp.RiskCalculationStatus_ProgressMilestone_STATUS_INPROGRESS { currentMilestone = milestone.GetDescription() } }