Merge pull request #1 from Uddipaan-Hazarika/rollback_dsource

rollback_dsource -> dsource_update

Author: Uddipaan-Hazarika

examples/vdb/postgresql/snapshot/main.tf

@@ -41,11 +41,6 @@ resource "delphix_vdb" "example" {
     postgresPort        = 5434
     configSettingsStg   = [{ propertyName: "timezone", value:"GMT", commentProperty:false}]
   })
-  additional_mount_points = [{
-      shared_path = "/",
-      mount_path = "/work",
-      environment_id = "environment-123"
-  }]
 
   post_snapshot {
     name            = "string"

internal/provider/resource_appdata_dsource.go

@@ -26,6 +26,11 @@ func resourceAppdataDsource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"rollback_on_failure": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 			"source_value": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -473,9 +478,28 @@ func resourceAppdataDsourceCreate(ctx context.Context, d *schema.ResourceData, m
 
 	tflog.Info(ctx, DLPX+INFO+"Job result is "+job_res)
 
+	rollback_on_failure := d.Get("rollback_on_failure").(bool)
+
 	if job_res == Failed || job_res == Canceled || job_res == Abandoned {
-		d.SetId("")
 		tflog.Error(ctx, DLPX+ERROR+"Job "+job_res+" "+*apiRes.Job.Id+"!")
+		if rollback_on_failure {
+			if job_res == Failed {
+				res := isSnapSyncFailure(*apiRes.Job.Id, ctx, client)
+				if res {
+					deleteDiags := resourceDsourceDelete(ctx, d, meta)
+					if deleteDiags.HasError() {
+						return deleteDiags
+					}
+					d.SetId("")
+				}
+			}
+		} else {
+			readDiags := resourceDsourceRead(ctx, d, meta)
+
+			if readDiags.HasError() {
+				return readDiags
+			}
+		}
 		return diag.Errorf("[NOT OK] Job %s %s with error %s", *apiRes.Job.Id, job_res, job_err)
 	}
 
@@ -491,7 +515,6 @@ func resourceAppdataDsourceCreate(ctx context.Context, d *schema.ResourceData, m
 }
 
 func resourceDsourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-
 	client := meta.(*apiClient).client
 
 	dsource_id := d.Id()
@@ -527,6 +550,12 @@ func resourceDsourceRead(ctx context.Context, d *schema.ResourceData, meta inter
 		return diag.Errorf("Error occured in type casting.")
 	}
 
+	_, rollback_on_failure_exists := d.GetOk("rollback_on_failure")
+	if !rollback_on_failure_exists {
+		// its an import or upgrade, set to default value
+		d.Set("rollback_on_failure", false)
+	}
+
 	d.Set("id", result.GetId())
 	d.Set("database_type", result.GetDatabaseType())
 	d.Set("name", result.GetName())

internal/provider/resource_oracle_dsource.go

@@ -27,6 +27,11 @@ func resourceOracleDsource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"rollback_on_failure": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 			"source_value": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -790,9 +795,28 @@ func resourceOracleDsourceCreate(ctx context.Context, d *schema.ResourceData, me
 
 	tflog.Info(ctx, DLPX+INFO+"Job result is "+job_res)
 
+	rollback_on_failure := d.Get("rollback_on_failure").(bool)
+
 	if job_res == Failed || job_res == Canceled || job_res == Abandoned {
-		d.SetId("")
 		tflog.Error(ctx, DLPX+ERROR+"Job "+job_res+" "+*apiRes.Job.Id+"!")
+		if rollback_on_failure {
+			if job_res == Failed {
+				res := isSnapSyncFailure(*apiRes.Job.Id, ctx, client)
+				if res {
+					deleteDiags := resourceOracleDsourceDelete(ctx, d, meta)
+					if deleteDiags.HasError() {
+						return deleteDiags
+					}
+					d.SetId("")
+				}
+			}
+		} else {
+			readDiags := resourceOracleDsourceRead(ctx, d, meta)
+
+			if readDiags.HasError() {
+				return readDiags
+			}
+		}
 		return diag.Errorf("[NOT OK] Job %s %s with error %s", *apiRes.Job.Id, job_res, job_err)
 	}
 
@@ -844,6 +868,12 @@ func resourceOracleDsourceRead(ctx context.Context, d *schema.ResourceData, meta
 		return diag.Errorf("Error occured in type casting.")
 	}
 
+	_, rollback_on_failure_exists := d.GetOk("rollback_on_failure")
+	if !rollback_on_failure_exists {
+		// its an import or upgrade, set to default value
+		d.Set("rollback_on_failure", false)
+	}
+
 	ops_pre_sync_Raw, _ := d.Get("ops_pre_sync").([]interface{})
 	oldOpsPreSync := toSourceOperationArray(ops_pre_sync_Raw)
 

internal/provider/resource_vdb.go

@@ -1592,7 +1592,7 @@ func resourceVdbRead(ctx context.Context, d *schema.ResourceData, meta interface
 	d.Set("post_stop", flattenVDbHooks(result.GetHooks().PostStop))
 	d.Set("pre_rollback", flattenVDbHooks(result.GetHooks().PreRollback))
 	d.Set("post_rollback", flattenVDbHooks(result.GetHooks().PostRollback))
-	if !*result.IsAppdata {
+	if !result.GetIsAppdata() {
 		d.Set("database_name", result.GetDatabaseName())
 	}
 

internal/provider/utility.go

@@ -361,3 +361,15 @@ func toIntArray(array interface{}) []int32 {
 	}
 	return items
 }
+
+func isSnapSyncFailure(job_id string, ctx context.Context, client *dctapi.APIClient) bool {
+	res, httpRes, _ := client.JobsAPI.GetJobById(ctx, job_id).Execute()
+	if httpRes.StatusCode == 200 && len(res.GetTasks()) != 0 {
+		tflog.Info(ctx, "Status of task 1 is "+res.GetTasks()[0].GetStatus())
+		if res.GetTasks()[0].GetStatus() == "COMPLETED" {
+			tflog.Info(ctx, "rolling back Dsource")
+			return true
+		}
+	}
+	return false
+}