removed default for persistence in outbound security module. Default was presumptuous.

Author: bradhead

example_import/reset_state.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Reset the state of the example_import project
+rm terraform.tfstate
+rm terraform.tfstate.backup
+rm -rf .terraform.lock.hcl
+terraform init -upgrade

example_import/smart_auth_imported.tf

@@ -22,5 +22,4 @@ resource "smilecdr_smart_outbound_security" "smart_auth" {
   davinci_native_consent_handling           = false
   smart_callback_post_authorize_script_text = local.post_authorize_callback
   dependency_local_inbound_security         = "SECURITY_IN_UP"
-  dependency_fhir_persistence_module        = "PERSISTENCE_ALL"
 }

provider/resource_smart_outbound_security.go

@@ -519,7 +519,6 @@ func resourceSmartOutboundSecurity() *schema.Resource {
 			"dependency_fhir_persistence_module": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Default:     "PERSISTANCE_ALL",
 				Description: "The FHIR Storage module to associate with this module.",
 			},
 			"dependency_saml_authentication_module": {
@@ -862,6 +861,7 @@ func smartOutboundSecurityResourceToModuleConfig(d *schema.ResourceData) (*smile
 		})
 	}
 	if v, ok := d.GetOk("smart_callback_post_authorize_script_text"); ok {
+		fmt.Printf("smart_callback_post_authorize_script_text: %s\n", v.(string))
 		moduleConfig.Options = append(moduleConfig.Options, smilecdr.ModuleOption{
 			Key:   "post_authorize_script.text",
 			Value: v.(string),

smilecdr/client.go

@@ -70,14 +70,15 @@ func (c *Client) Get(ctx context.Context, endpoint string) ([]byte, error) {
 		return nil, err
 	}
 
-	body, err := io.ReadAll(resp.Body)
+	rBody, err := io.ReadAll(resp.Body)
+
 	if err != nil {
 		errMsg := fmt.Sprintf("Http GET: error reading Response Body: %s", err.Error())
 		tflog.Error(ctx, errMsg)
 		return nil, err
 	}
 
-	return body, nil
+	return rBody, nil
 }
 
 func (c *Client) Post(ctx context.Context, endpoint string, body []byte) ([]byte, error) {
@@ -107,14 +108,16 @@ func (c *Client) Post(ctx context.Context, endpoint string, body []byte) ([]byte
 		return nil, err
 	}
 
-	body, err = io.ReadAll(resp.Body)
+	var rBody []byte = nil
+
+	rBody, err = io.ReadAll(resp.Body)
 	if err != nil {
 		errMsg := fmt.Sprintf("Http POST: Error reading Response Body: %s", err)
 		tflog.Info(ctx, errMsg)
 		return nil, err
 	}
 
-	return body, nil
+	return rBody, nil
 }
 
 func (c *Client) Put(ctx context.Context, endpoint string, body []byte) ([]byte, error) {
@@ -144,13 +147,15 @@ func (c *Client) Put(ctx context.Context, endpoint string, body []byte) ([]byte,
 		return nil, err
 	}
 
-	body, err = io.ReadAll(resp.Body)
+	var rBody []byte = nil
+
+	rBody, err = io.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Printf("[ERROR] Http PUT: Error reading Response Body: %s", err.Error())
 		return nil, err
 	}
 
-	return body, nil
+	return rBody, nil
 }
 
 func (c *Client) Delete(ctx context.Context, endpoint string) ([]byte, error) {
@@ -177,11 +182,11 @@ func (c *Client) Delete(ctx context.Context, endpoint string) ([]byte, error) {
 		return nil, err
 	}
 
-	body, err := io.ReadAll(resp.Body)
+	rBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println("[ERROR] Http DELETE: Error reading Response Body:", err)
 		return nil, err
 	}
 
-	return body, nil
+	return rBody, nil
 }

smilecdr/module_config.go

@@ -26,6 +26,20 @@ type ModuleConfig struct {
 	Dependencies []ModuleDependency `json:"dependencies,omitempty"`
 }
 
+func printModuleConfig(moduleConfig ModuleConfig) {
+	fmt.Println("ModuleConfig:")
+	fmt.Println("  ModuleId: ", moduleConfig.ModuleId)
+	fmt.Println("  ModuleType: ", moduleConfig.ModuleType)
+	fmt.Println("  Options:")
+	for _, kv := range moduleConfig.Options {
+		fmt.Println("    ", kv.Key, ": ", kv.Value)
+	}
+	fmt.Println("  Dependencies:")
+	for _, dep := range moduleConfig.Dependencies {
+		fmt.Println("    ", dep.ModuleId, ": ", dep.Type)
+	}
+}
+
 func (moduleConfig *ModuleConfig) LookupOptionOk(key string) (string, bool) {
 
 	moduleConfigOptions := moduleConfig.Options
@@ -94,9 +108,19 @@ func (smilecdr *Client) PutModuleConfig(ctx context.Context, nodeId string, modu
 	var moduleId = module.ModuleId
 
 	var endpoint = fmt.Sprintf("/module-config/%s/%s/set", nodeId, moduleId)
-	jsonBody, _ := json.Marshal(module)
+
+	printModuleConfig(module) // DEBUG
+
+	jsonBody, error := json.Marshal(module)
+	if error != nil {
+		fmt.Println("error marshalling moduleConfig:", error)
+		return module, error
+	}
+
+	fmt.Println("PutModuleConfig: ", string(jsonBody))
 
 	resp, putErr := smilecdr.Put(ctx, endpoint, jsonBody)
+
 	if putErr != nil {
 		fmt.Println("error during Put in PutModuleConfig:", putErr)
 		fmt.Println("ResponseBody:", string(resp))