Add more info when stopping/starting instances (#46)

* Add more info when stopping/starting instances * Print instance tags too * Print only the first 10 tags * Pass ctx to print requestID and service UUID Do not print instance tags as they can be altered by the users and cannot be trusted. * string casting not necessary, already a string * go fmt
rhpds · Nov 14, 2023 · e7a1a3b · e7a1a3b
1 parent b062cad
commit e7a1a3b
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 17 deletions.
diff --git a/cmd/sandbox-api/workers.go b/cmd/sandbox-api/workers.go
@@ -69,16 +69,42 @@ func (w Worker) Execute(j *models.LifecycleResourceJob) error {
 		}
 
 		log.Logger.Debug("assume successful")
+
+		ctx := context.TODO()
+
+		// Add RequestID to context
+		ctx = context.WithValue(ctx, "RequestID", j.RequestID)
+		// If job has a parent, add serviceUUID to context
+		if j.ParentID != 0 {
+			// Load parent job from DB
+			parentJob, err := models.GetLifecyclePlacementJob(w.Dbpool, j.ParentID)
+
+			if err != nil {
+				log.Logger.Error("Error getting parent job", "error", err)
+				return err
+			}
+
+			// Load placement from DB
+			placement, err := models.GetPlacement(w.Dbpool, parentJob.PlacementID)
+			if err != nil {
+				log.Logger.Error("Error getting placement", "error", err)
+				return err
+			}
+
+			// Add service UUID to context
+			ctx = context.WithValue(ctx, "ServiceUUID", placement.ServiceUuid)
+		}
+
 		switch j.Action {
 		case "start":
 			j.SetStatus("running")
-			return sandbox.Start(assume.Credentials)
+			return sandbox.Start(ctx, assume.Credentials)
 		case "stop":
 			j.SetStatus("running")
-			return sandbox.Stop(assume.Credentials)
+			return sandbox.Stop(ctx, assume.Credentials)
 		case "status":
 			j.SetStatus("running")
-			status, err := sandbox.Status(assume.Credentials, j)
+			status, err := sandbox.Status(ctx, assume.Credentials, j)
 			if err != nil {
 				j.SetStatus("error")
 				log.Logger.Error("Error getting status", "error", err)

diff --git a/internal/dynamodb/accounts.go b/internal/dynamodb/accounts.go
@@ -2,7 +2,6 @@ package dynamodb
 
 import (
 	"errors"
-	"log/slog"
 	"os"
 	"sort"
 	"strconv"
@@ -246,7 +245,6 @@ func GetAccount(svc *dynamodb.DynamoDB, name string) (AwsAccountDynamoDB, error)
 		log.Logger.Error("Unmarshalling dynamodb item", "error", err)
 		return AwsAccountDynamoDB{}, err
 	}
-	log.Logger.Info("GetItem succeeded", slog.String("sandbox", sandbox.Name))
 
 	return sandbox, nil
 }

diff --git a/internal/log/log.go b/internal/log/log.go
@@ -36,7 +36,7 @@ func InitLoggers(debugFlag bool, attrs []slog.Attr) {
 	}
 
 	opts := slog.HandlerOptions{
-		Level: slog.LevelInfo,
+		Level:       slog.LevelInfo,
 		ReplaceAttr: replaceAttrs,
 	}
 	if debugFlag {

diff --git a/internal/models/aws_account.go b/internal/models/aws_account.go
@@ -130,7 +130,7 @@ func Sort[T Sortable](accounts []T, by string) []T {
 }
 
 // Start method starts all the stopped instances in the account
-func (a AwsAccount) Start(creds *ststypes.Credentials) error {
+func (a AwsAccount) Start(ctx context.Context, creds *ststypes.Credentials) error {
 	cfg, err := config.LoadDefaultConfig(context.TODO())
 	if err != nil {
 		log.Logger.Error("Error loading config", "error", err)
@@ -201,7 +201,15 @@ func (a AwsAccount) Start(creds *ststypes.Credentials) error {
 					errR = err
 					continue
 				}
-				log.Logger.Info("Start instance", "account", a.Name, "instance_id", *instance.InstanceId)
+				log.Logger.Info("Start instance",
+					"account", a.Name,
+					"account_id", a.AccountID,
+					"instance_id", *instance.InstanceId,
+					"instance_type", instance.InstanceType,
+					"region", *region.RegionName,
+					"request_id", ctx.Value("RequestID"),
+					"service_uuid", ctx.Value("ServiceUUID"),
+				)
 			}
 		}
 	}
@@ -210,7 +218,7 @@ func (a AwsAccount) Start(creds *ststypes.Credentials) error {
 }
 
 // Stop method stops all the running instances in the account
-func (a AwsAccount) Stop(creds *ststypes.Credentials) error {
+func (a AwsAccount) Stop(ctx context.Context, creds *ststypes.Credentials) error {
 	cfg, err := config.LoadDefaultConfig(context.TODO())
 	if err != nil {
 		log.Logger.Error("Error loading config", "error", err)
@@ -276,7 +284,15 @@ func (a AwsAccount) Stop(creds *ststypes.Credentials) error {
 					errR = err
 					continue
 				}
-				log.Logger.Info("Stop instance", "account", a.Name, "instance_id", *instance.InstanceId)
+				log.Logger.Info("Stop instance",
+					"account", a.Name,
+					"account_id", a.AccountID,
+					"instance_id", *instance.InstanceId,
+					"instance_type", instance.InstanceType,
+					"region", *region.RegionName,
+					"request_id", ctx.Value("RequestID"),
+					"service_uuid", ctx.Value("ServiceUUID"),
+				)
 			}
 		}
 	}
@@ -319,7 +335,7 @@ func MakeStatus(job *LifecycleResourceJob) Status {
 }
 
 // Status method returns the status of all the instances in the account
-func (a AwsAccount) Status(creds *ststypes.Credentials, job *LifecycleResourceJob) (Status, error) {
+func (a AwsAccount) Status(ctx context.Context, creds *ststypes.Credentials, job *LifecycleResourceJob) (Status, error) {
 	cfg, err := config.LoadDefaultConfig(context.TODO())
 	if err != nil {
 		log.Logger.Error("Error loading config", "error", err)

diff --git a/internal/models/lifecycle_jobs.go b/internal/models/lifecycle_jobs.go
@@ -43,9 +43,9 @@ func GetLifecycleResourceJob(dbpool *pgxpool.Pool, id int) (*LifecycleResourceJo
 
 	err := dbpool.QueryRow(
 		context.Background(),
-		"SELECT id, COALESCE(parent_id, 0), resource_name, resource_type, status, request, lifecycle_result, lifecycle_action, updated_at, locality FROM lifecycle_resource_jobs WHERE id = $1",
+		"SELECT id, COALESCE(parent_id, 0), resource_name, resource_type, status, request_id, request, lifecycle_result, lifecycle_action, updated_at, locality FROM lifecycle_resource_jobs WHERE id = $1",
 		id,
-	).Scan(&j.ID, &j.ParentID, &j.ResourceName, &j.ResourceType, &j.Status, &j.Request, &j.Result, &j.Action, &j.UpdatedAt, &j.Locality)
+	).Scan(&j.ID, &j.ParentID, &j.ResourceName, &j.ResourceType, &j.Status, &j.RequestID, &j.Request, &j.Result, &j.Action, &j.UpdatedAt, &j.Locality)
 
 	if err != nil {
 		return nil, err
@@ -80,9 +80,9 @@ func GetLifecyclePlacementJob(dbpool *pgxpool.Pool, id int) (*LifecyclePlacement
 
 	err := dbpool.QueryRow(
 		context.Background(),
-		"SELECT id, placement_id, status, request, lifecycle_action, locality FROM lifecycle_placement_jobs WHERE id = $1",
+		"SELECT id, placement_id, status, request_id, request, lifecycle_action, locality FROM lifecycle_placement_jobs WHERE id = $1",
 		id,
-	).Scan(&j.ID, &j.PlacementID, &j.Status, &j.Request, &j.Action, &j.Locality)
+	).Scan(&j.ID, &j.PlacementID, &j.Status, &j.RequestID, &j.Request, &j.Action, &j.Locality)
 	if err != nil {
 		return nil, err
 	}
@@ -98,9 +98,9 @@ func GetLifecyclePlacementJobByRequestID(dbpool *pgxpool.Pool, requestID string)
 
 	err := dbpool.QueryRow(
 		context.Background(),
-		"SELECT id, placement_id, status, request, lifecycle_action, locality FROM lifecycle_placement_jobs WHERE request_id = $1",
+		"SELECT id, placement_id, status, request_id, request, lifecycle_action, locality FROM lifecycle_placement_jobs WHERE request_id = $1",
 		requestID,
-	).Scan(&j.ID, &j.PlacementID, &j.Status, &j.Request, &j.Action, &j.Locality)
+	).Scan(&j.ID, &j.PlacementID, &j.Status, &j.RequestID, &j.Request, &j.Action, &j.Locality)
 	if err != nil {
 		return nil, err
 	}

diff --git a/tools/placement_action.hurl b/tools/placement_action.hurl
@@ -0,0 +1,21 @@
+#################################################################################
+# Get an access token using the login token
+#################################################################################
+
+GET http://{{host}}/api/v1/login
+Authorization: Bearer {{login_token}}
+HTTP 200
+[Captures]
+access_token: jsonpath "$.access_token"
+[Asserts]
+jsonpath "$.access_token" isString
+jsonpath "$.access_token_exp" isString
+
+
+#################################################################################
+# Stop a placement
+#################################################################################
+
+PUT http://{{host}}/api/v1/placements/{{uuid}}/{{action}}
+Authorization: Bearer {{access_token}}
+HTTP 202
diff --git a/tools/sandbox_action.hurl b/tools/sandbox_action.hurl
@@ -0,0 +1,21 @@
+#################################################################################
+# Get an access token using the login token
+#################################################################################
+
+GET http://{{host}}/api/v1/login
+Authorization: Bearer {{login_token}}
+HTTP 200
+[Captures]
+access_token: jsonpath "$.access_token"
+[Asserts]
+jsonpath "$.access_token" isString
+jsonpath "$.access_token_exp" isString
+
+
+#################################################################################
+# Stop a placement
+#################################################################################
+
+PUT http://{{host}}/api/v1/accounts/{{type}}/{{name}}/{{action}}
+Authorization: Bearer {{access_token}}
+HTTP 202