Merge branch 'feature/transactionize'

Author: p-b--

README.md

@@ -80,6 +80,7 @@ Restore assessment data to a VECTR instance from an encrypted, compressed file:
 - `--target-assessment-name`: Overrides the name of the assessment being restored in the target instance. Required when using `--source-campaign-name`.
 - `--source-campaign-name`: Name of a specific campaign to restore from the input file. If set, `--target-assessment-name` must be an existing assessment.
 - `--override-template-assessment`: Overrides any set template name in the serialized data and loads template test cases anyway.
+- `--delete-on-failure`: In the case of a failure, delete the created assessment from VECTR. (Note: this does not affect single campaign transfers)
 - `-k`: Allow insecure connections (e.g., ignore TLS certificate errors).
 - `--client-cert-file`: Path to the client certificate file for mTLS.
 - `--client-key-file`: Path to the client key file for mTLS.
@@ -143,6 +144,7 @@ Transfer an assessment from one VECTR instance directly to another:
 #### Optional Options
 - `--target-assessment-name`: Overrides the name of the assessment in the target instance.
 - `--override-template-assessment`: Overrides the template assessment set in the serialized data and uses the saved template data (lower fidelity).
+- `--delete-on-failure`: In the case of a failure, delete the created assessment from VECTR. (Note: this does not affect single campaign transfers)
 - `-k`: Allow insecure connections (e.g., ignore TLS certificate errors). (will be applied for both source and dest)
 - `--client-cert-file`: Path to the client certificate file for mTLS. (will be applied for both source and dest)
 - `--client-key-file`: Path to the client key file for mTLS. (will be applied for both source and dest)

cmd/cmd.go

@@ -15,6 +15,7 @@ var (
 	insecure                   bool
 	targetAssessmentName       string
 	overrideAssessmentTemplate bool
+	deleteOnFailure            bool
 	clientCertFile             string
 	clientKeyFile              string
 	caCertFiles                []string

cmd/restorer.go

@@ -96,6 +96,7 @@ var restoreCmd = &cobra.Command{
 		client, vectrVersionHandler, err := util.SetupVectrClient(hostname, strings.TrimSpace(string(credentials)), tlsParams)
 		if err != nil {
 			slog.ErrorContext(ctx, "could not set up connection to vectr", "hostname", hostname, "error", err)
+			os.Exit(1)
 		}
 
 		// get the VECTR version (side effect - check the creds as well)
@@ -115,6 +116,7 @@ var restoreCmd = &cobra.Command{
 			optionalParams := &vat.RestoreOptionalParams{
 				AssessmentName:             targetAssessmentName,
 				OverrideAssessmentTemplate: overrideAssessmentTemplate,
+				DeleteOnFailure:            deleteOnFailure,
 			}
 
 			// Restore the assessment
@@ -148,6 +150,7 @@ func init() {
 	restoreCmd.Flags().StringVar(&passphraseFile, "passphrase-file", "", "Path to the file containing the decryption passphrase")
 	restoreCmd.Flags().StringVar(&targetAssessmentName, "target-assessment-name", "", "The assessment name to set in the new instance. Required when using --source-campaign-name.")
 	restoreCmd.Flags().BoolVar(&overrideAssessmentTemplate, "override-template-assessment", false, "Override any set template name in the serialized data and load template test cases anyway")
+	restoreCmd.Flags().BoolVar(&deleteOnFailure, "delete-on-failure", false, "In the case of a failure, delete the created assessment from VECTR (does not delete template information). Does not affect single campaign inserts.")
 	restoreCmd.Flags().StringVar(&sourceCampaignName, "source-campaign-name", "", "Name of a specific campaign to restore from the input file. If set, --target-assessment-name must be an existing assessment.")
 
 	// Mark flags as required

cmd/transfer.go

@@ -58,7 +58,8 @@ var transferCmd = &cobra.Command{
 		// Set up the source VECTR client
 		sourceClient, sourceVectrVersionHandler, err := util.SetupVectrClient(sourceHostname, strings.TrimSpace(string(sourceCredentials)), tlsParams)
 		if err != nil {
-			slog.ErrorContext(ctx, "could not set up connection to vectr", "hostname", hostname, "error", err)
+			slog.ErrorContext(ctx, "could not set up connection to vectr", "hostname", sourceHostname, "error", err)
+			os.Exit(1)
 		}
 
 		// get the VECTR version (side effect - check the creds as well)
@@ -78,6 +79,7 @@ var transferCmd = &cobra.Command{
 		targetClient, targetVectrVersionHandler, err := util.SetupVectrClient(targetHostname, strings.TrimSpace(string(targetCredentials)), tlsParams)
 		if err != nil {
 			slog.ErrorContext(ctx, "could not set up connection to vectr", "hostname", targetHostname, "error", err)
+			os.Exit(1)
 		}
 		// get the VECTR version (side effect - check the creds as well)
 		targetVectrVersion, err := targetVectrVersionHandler.GetVersion(ctx)
@@ -104,6 +106,7 @@ var transferCmd = &cobra.Command{
 			optionalParams := &vat.RestoreOptionalParams{
 				AssessmentName:             targetAssessmentName,
 				OverrideAssessmentTemplate: overrideAssessmentTemplate,
+				DeleteOnFailure:            deleteOnFailure,
 			}
 			// Original full assessment transfer logic
 			slog.InfoContext(targetVersionContext, "Transferring assessment data to target instance", "hostname", targetHostname, "db", targetDB)
@@ -141,6 +144,7 @@ func init() {
 	transferCmd.Flags().StringVar(&assessmentName, "assessment-name", "", "Name of the assessment to transfer (required)")
 	transferCmd.Flags().StringVar(&targetAssessmentName, "target-assessment-name", "", "The assessment name to set in the new instance")
 	transferCmd.Flags().BoolVar(&overrideAssessmentTemplate, "override-template-assessment", false, "Ignore the template name in the serialized data and load template test cases anyway")
+	transferCmd.Flags().BoolVar(&deleteOnFailure, "delete-on-failure", false, "In the case of a failure, delete the created assessment from VECTR (does not delete template information). Does not affect single campaign inserts.")
 	transferCmd.Flags().StringVar(&sourceCampaignName, "source-campaign-name", "", "Name of a specific campaign to transfer. If set, --target-assessment-name must be an existing assessment.")
 
 	// Mark flags as required

graphql/operations/DeleteAssessment.graphql

@@ -0,0 +1,7 @@
+mutation DeleteAssessment($db: String!, $ids: [String!]!) {
+  assessment {
+    delete(input: { db: $db, ids: $ids }) {
+      deletedIds
+    }
+  }
+}