fix: refresh admin email on registration retry and improve logging

Author: JocLRojas

threadwinds-ingestion/internal/client/cm_client.go

@@ -57,14 +57,17 @@ func (c *CustomersManagerClient) RegisterUserReporter(email string) (*Registrati
 		case http.StatusBadRequest:
 			return nil, catcher.Error("invalid registration data", err, map[string]any{
 				"status": statusCode,
+				"email":  email,
 			})
 		case http.StatusInternalServerError:
 			return nil, catcher.Error("registration service error", err, map[string]any{
 				"status": statusCode,
+				"email":  email,
 			})
 		default:
 			return nil, catcher.Error("registration failed", err, map[string]any{
 				"status": statusCode,
+				"email":  email,
 			})
 		}
 	}

threadwinds-ingestion/internal/client/postgres_client.go

@@ -92,6 +92,11 @@ func (c *PostgresClient) GetAdminEmail(ctx context.Context) (*AdminEmailResult,
 		result.LastModified = lastModifiedDate.Time
 	}
 
+	catcher.Info("retrieved current admin email", map[string]any{
+		"email":            email,
+		"last_modified_by": lastModifiedBy,
+	})
+
 	return result, nil
 }
 

threadwinds-ingestion/main.go

@@ -63,7 +63,16 @@ func main() {
 		var regResp *client.RegistrationResponse
 
 		registerFunc := func() error {
-			resp, err := cmClient.RegisterUserReporter(adminEmail)
+			currentEmail, emailErr := postgresClient.GetAdminEmail(ctx)
+			if emailErr != nil {
+				return catcher.Error("failed to get current admin email", emailErr, nil)
+			}
+
+			catcher.Info("attempting ThreadWinds registration", map[string]any{
+				"email": currentEmail.Email,
+			})
+
+			resp, err := cmClient.RegisterUserReporter(currentEmail.Email)
 			if err != nil {
 				return err
 			}