Fix resource aws ospworks application secure, ssh_key, password handling

aws/resource_aws_opsworks_application.go

@@ -414,12 +414,7 @@ func resourceAwsOpsworksSetApplicationEnvironmentVariable(d *schema.ResourceData
 			data["value"] = *config.Value
 		}
 		if config.Secure != nil {
-
-			if bool(*config.Secure) {
-				data["secure"] = &opsworksTrueString
-			} else {
-				data["secure"] = &opsworksFalseString
-			}
+			data["secure"] = *config.Secure
 		}
 		log.Printf("[DEBUG] v: %s", data)
 	}
@@ -478,6 +473,15 @@ func resourceAwsOpsworksSetApplicationSource(d *schema.ResourceData, v *opsworks
 		if v.Revision != nil {
 			m["revision"] = *v.Revision
 		}
+
+		// v.Password will, on read, contain the placeholder string
+		// "*****FILTERED*****", so we ignore it on read and let persist
+		// the value already in the state.
+		m["password"] = d.Get("app_source.0.password").(string)
+		// ssh_key can not be read via api, so we ignore it on read and let persist
+		// the value already in the state.
+		m["ssh_key"] = d.Get("app_source.0.ssh_key").(string)
+
 		nv = append(nv, m)
 	}
 

aws/resource_aws_opsworks_stack.go

@@ -255,6 +255,11 @@ func resourceAwsOpsworksSetStackCustomCookbooksSource(d *schema.ResourceData, v
 		// v.Password will, on read, contain the placeholder string
 		// "*****FILTERED*****", so we ignore it on read and let persist
 		// the value already in the state.
+		m["password"] = d.Get("custom_cookbooks_source.0.password").(string)
+		// ssh_key can not be read via api, so we ignore it on read and let persist
+		// the value already in the state.
+		m["ssh_key"] = d.Get("custom_cookbooks_source.0.ssh_key").(string)
+
 		nv = append(nv, m)
 	}