documentation and logging changes

Author: ankit-patil-hubs

docs/resources/appdata_dsource.md

@@ -4,11 +4,11 @@ In Delphix terminology, a dSource is a database that the Delphix Continuous Data
 A dSource is created and managed by the Delphix Continuous Data Engine.
 
 
-The dSource resource allows Terraform to apply and destroy Delphix dSources. 
-Modification of existing dSource resources is not supported. All supported parameters are listed below
+The appdata dSource resource allows Terraform to apply and destroy Delphix dSources. 
+Modification of existing appdata dSource resources is not supported. All supported parameters are listed below
 
 ## Example Usage
-dSource linking can be done in 3 methods , the parameters for these methods wary based on the linking mechanism to be used. 
+Appdata dSource linking can be done in 3 methods , the parameters for these methods wary based on the linking mechanism to be used. 
 
 ```hcl
 # Link dSource using external backup. 
@@ -109,7 +109,7 @@ resource "delphix_appdata_dsource" "dsource_name" {
 
 * `source_id` - (Required) Id of the source to link.
 
-* `group_id` - (Optional)  Id of the dataset group where this dSource should belong to.
+* `group_id` - (Required)  Id of the dataset group where this dSource should belong to.
 
 * `log_sync_enabled` - (Required) True if LogSync should run for this database.
 
@@ -171,6 +171,8 @@ resource "delphix_appdata_dsource" "dsource_name" {
 
 * `excludes` - (Optional) List of subdirectories in the source to exclude when syncing data.These paths are relative to the root of the source directory. [AppDataDirect only]
 
+* `follow_symlinks` - (Optional) List of symlinks in the source to follow when syncing data.These paths are relative to the root of the source directory. All other symlinks are preserved. [AppDataDirect only]
+
 * `parameters` - (Optional) The JSON payload conforming to the DraftV4 schema based on the type of application data being manipulated.
 
 * `sync_parameters` - (Optional) The JSON payload conforming to the snapshot parameters definition in a LUA toolkit or platform plugin.

examples/dsource/main.tf

@@ -53,7 +53,7 @@ provider "delphix" {
 
 resource "delphix_appdata_dsource" "test_app_data_dsource_second" {
   source_id                  = "1-APPDATA_STAGED_SOURCE_CONFIG-7"
-  group_id                   = ""
+  group_id                   = "1-GROUP-1"
   log_sync_enabled           = false
   make_current_account_owner = true
   link_type                  = "AppDataStaged"
@@ -71,14 +71,33 @@ resource "delphix_appdata_dsource" "test_app_data_dsource_second" {
         sourceHostAddress : "HOSTNAME"
       }
     ],
-    postgresPort : XXXX,
+    postgresPort : 5433,
     mountLocation : "/tmp/delphix_mnt_second"
   })
   sync_parameters = jsonencode({
     resync = true
   })
+  ops_pre_sync {
+    name    = "key-1"
+    command = "echo \"hello world\""
+    shell   = "shell"
+    credentials_env_vars {
+      base_var_name = "XXXX"
+      password      = "XXXX"
+    }
+  }
+  ops_post_sync {
+    name    = "key-2"
+    command = "echo \"hello world\""
+    shell   = "shell"
+    credentials_env_vars {
+      base_var_name = "XXXX"
+      password      = "XXXX"
+    }
+  }
 }
 
+
 # Below are the 3 ways to link dsource with params , use any one of them
 #  externalBackup: [
 #             {

internal/provider/resource_appdata_dsource.go

@@ -13,7 +13,7 @@ import (
 func resourceAppdataDsource() *schema.Resource {
 	return &schema.Resource{
 		// This description is used by the documentation generator and the language server.
-		Description: "Resource for app data dsource creation.",
+		Description: "Resource for appdata dSource creation.",
 
 		CreateContext: resourceAppdataDsourceCreate,
 		ReadContext:   resourceAppdataDsourceRead,
@@ -331,7 +331,9 @@ func toSourceOperationArray(array interface{}) []dctapi.SourceOperation {
 	for _, item := range array.([]interface{}) {
 		item_map := item.(map[string]interface{})
 		sourceOperation := dctapi.NewSourceOperation(item_map["name"].(string), item_map["command"].(string))
-		sourceOperation.SetShell(item_map["shell"].(string))
+		if item_map["shell"].(string) != "" {
+			sourceOperation.SetShell(item_map["shell"].(string))
+		}
 		sourceOperation.SetCredentialsEnvVars(toCredentialsEnvVariableArray(item_map["credentials_env_vars"]))
 		items = append(items, *sourceOperation)
 	}
@@ -342,17 +344,38 @@ func toCredentialsEnvVariableArray(array interface{}) []dctapi.CredentialsEnvVar
 	items := []dctapi.CredentialsEnvVariable{}
 	for _, item := range array.([]interface{}) {
 		item_map := item.(map[string]interface{})
+
 		credentialsEnvVariable_item := dctapi.NewCredentialsEnvVariable(item_map["base_var_name"].(string))
-		credentialsEnvVariable_item.SetPassword(item_map["password"].(string))
-		credentialsEnvVariable_item.SetVault(item_map["vault"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["hashicorp_vault_engine"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["hashicorp_vault_secret_path"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["hashicorp_vault_username_key"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["hashicorp_vault_secret_key"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["azure_vault_name"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["azure_vault_username_key"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["azure_vault_secret_key"].(string))
-		credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["cyberark_vault_query_string"].(string))
+		if item_map["password"].(string) != "" {
+			credentialsEnvVariable_item.SetPassword(item_map["password"].(string))
+		}
+		if item_map["vault"].(string) != "" {
+			credentialsEnvVariable_item.SetVault(item_map["vault"].(string))
+		}
+		if item_map["hashicorp_vault_engine"].(string) != "" {
+			credentialsEnvVariable_item.SetHashicorpVaultEngine(item_map["hashicorp_vault_engine"].(string))
+		}
+		if item_map["hashicorp_vault_secret_path"].(string) != "" {
+			credentialsEnvVariable_item.SetHashicorpVaultSecretPath(item_map["hashicorp_vault_secret_path"].(string))
+		}
+		if item_map["hashicorp_vault_username_key"].(string) != "" {
+			credentialsEnvVariable_item.SetHashicorpVaultUsernameKey(item_map["hashicorp_vault_username_key"].(string))
+		}
+		if item_map["hashicorp_vault_secret_key"].(string) != "" {
+			credentialsEnvVariable_item.SetHashicorpVaultSecretKey(item_map["hashicorp_vault_secret_key"].(string))
+		}
+		if item_map["azure_vault_name"].(string) != "" {
+			credentialsEnvVariable_item.SetAzureVaultName(item_map["azure_vault_name"].(string))
+		}
+		if item_map["azure_vault_username_key"].(string) != "" {
+			credentialsEnvVariable_item.SetAzureVaultUsernameKey(item_map["azure_vault_username_key"].(string))
+		}
+		if item_map["azure_vault_secret_key"].(string) != "" {
+			credentialsEnvVariable_item.SetAzureVaultSecretKey(item_map["azure_vault_secret_key"].(string))
+		}
+		if item_map["cyberark_vault_query_string"].(string) != "" {
+			credentialsEnvVariable_item.SetCyberarkVaultQueryString(item_map["cyberark_vault_query_string"].(string))
+		}
 		items = append(items, *credentialsEnvVariable_item)
 	}
 	return items
@@ -470,10 +493,10 @@ func resourceAppdataDsourceRead(ctx context.Context, d *schema.ResourceData, met
 		})
 		// This would imply error in poll for deletion so we just log and exit.
 		if diags != nil {
-			ErrorLog.Printf("Error in polling of Dsource for deletion.")
+			ErrorLog.Printf("Error in polling of appdata dSource for deletion.")
 		} else {
 			// diags will be nill in case of successful poll for deletion logic aka 404
-			ErrorLog.Printf("Error reading the Dsource %s, removing from state.", dsource_id)
+			ErrorLog.Printf("Error reading the appdata dSource %s, removing from state.", dsource_id)
 			d.SetId("")
 		}
 
@@ -519,7 +542,7 @@ func resourceAppdataDsourceUpdate(ctx context.Context, d *schema.ResourceData, m
 		d.Set(key, old)
 	}
 
-	return diag.Errorf("not implemented")
+	return diag.Errorf("Action update not implemented for resource : appdata dsource")
 }
 
 func resourceAppdataDsourceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -542,7 +565,7 @@ func resourceAppdataDsourceDelete(ctx context.Context, d *schema.ResourceData, m
 	}
 	InfoLog.Printf("Job result is %s", job_status)
 	if isJobTerminalFailure(job_status) {
-		return diag.Errorf("[NOT OK] Dsource-Delete %s. JobId: %s / Error: %s", job_status, *res.Id, job_err)
+		return diag.Errorf("[NOT OK] Appdata dSource-Delete %s. JobId: %s / Error: %s", job_status, *res.Id, job_err)
 	}
 
 	_, diags := PollForObjectDeletion(func() (interface{}, *http.Response, error) {