Merge pull request #83 from TelkomIndonesia/fix/inconsistent-plan

Fix inconsistent plan (#81)

Author: scottwinkler

shell/resource_shell_script.go

@@ -1,6 +1,7 @@
 package shell
 
 import (
+	"fmt"
 	"log"
 	"reflect"
 	"runtime"
@@ -87,6 +88,10 @@ func resourceShellScript() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				Default:  "",
+				ValidateFunc: func(i interface{}, s string) ([]string, []error) {
+					x0 := fmt.Errorf("`read_error` cannot be set from configuration")
+					return []string{}, []error{x0}
+				},
 			},
 		},
 	}
@@ -110,7 +115,19 @@ func resourceShellScriptRead(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func resourceShellScriptUpdate(d *schema.ResourceData, meta interface{}) error {
+func resourceShellScriptUpdate(d *schema.ResourceData, meta interface{}) (err error) {
+	if d.HasChange("lifecycle_commands.0.read") {
+		err = read(d, meta, []Action{ActionUpdate})
+		if err != nil {
+			_ = restoreOldResourceData(d)
+		}
+		return
+	}
+
+	if d.HasChanges("lifecycle_commands", "interpreter") {
+		return
+	}
+
 	return update(d, meta, []Action{ActionUpdate})
 }
 
@@ -124,6 +141,18 @@ func resourceShellScriptCustomizeDiff(d *schema.ResourceDiff, i interface{}) (er
 	}
 
 	if d.HasChange("lifecycle_commands") || d.HasChange("interpreter") {
+		for _, k := range []string{
+			"environment", "sensitive_environment", "working_directory"} {
+
+			if d.HasChange(k) {
+				return fmt.Errorf("changes to `lifecycle_commands` and/or `interpreter`" +
+					" should not be follwed by changes to other arguments")
+			}
+		}
+
+		if d.HasChange("lifecycle_commands.0.read") {
+			_ = d.SetNewComputed("output") //  assume output will change
+		}
 		return
 	}
 
@@ -135,16 +164,20 @@ func resourceShellScriptCustomizeDiff(d *schema.ResourceDiff, i interface{}) (er
 	}
 
 	if _, ok := d.GetOk("lifecycle_commands.0.update"); ok {
+		for _, k := range []string{
+			"environment", "sensitive_environment", "working_directory"} {
+
+			if d.HasChange(k) {
+				_ = d.SetNewComputed("output") //  assume output will change
+			}
+		}
 		return // updateable
 	}
 
 	// all the other arguments
 	for _, k := range []string{
-		"environment",
-		"sensitive_environment",
-		"working_directory",
-		"dirty",
-	} {
+		"environment", "sensitive_environment", "working_directory", "dirty"} {
+
 		if !d.HasChange(k) {
 			continue
 		}
@@ -299,11 +332,6 @@ func restoreOldResourceData(rd *schema.ResourceData, except ...string) (err erro
 }
 
 func update(d *schema.ResourceData, meta interface{}, stack []Action) error {
-	if d.HasChanges("lifecycle_commands", "interpreter") {
-		_ = restoreOldResourceData(d, "lifecycle_commands", "interpreter", "dirty", "read_error")
-		return nil
-	}
-
 	log.Printf("[DEBUG] Updating shell script resource...")
 	d.Set("dirty", false)
 	printStackTrace(stack)

shell/resource_shell_script_test.go

@@ -445,3 +445,62 @@ func testAccShellShellScriptConfig_updateCommands(filename string, bug bool) str
 		}
 	`, read, filename)
 }
+
+func TestAccShellShellScript_outputDependency(t *testing.T) {
+	file := "/tmp/test-file-" + acctest.RandString(16)
+	resource.Test(t, resource.TestCase{
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccShellShellScriptConfig_outputDependency(file, true, false),
+			},
+			{
+				Config: testAccShellShellScriptConfig_outputDependency(file, false, true),
+				Check:  resource.TestCheckResourceAttr("shell_script.dependent", "triggers.output", "false"),
+			},
+		},
+	})
+
+}
+
+func testAccShellShellScriptConfig_outputDependency(filename string, value bool, wdependent bool) (conf string) {
+	conf = fmt.Sprintf(`
+		resource "shell_script" "shell_script" {
+			lifecycle_commands {
+				create = <<-EOF
+					echo -n '{"value": '"$VALUE"'}' > "$FILE"
+				EOF
+				read = <<-EOF
+					cat "$FILE"
+				EOF
+				update = <<-EOF
+					echo -n '{"value": '"$VALUE"'}' > "$FILE"
+				EOF
+				delete = <<-EOF
+					rm "$FILE"
+				EOF
+			}
+			environment = {
+				FILE = "%s"
+				VALUE = "%t"
+			}
+		}
+	`, filename, value)
+
+	if wdependent {
+		conf = conf + `
+			resource "shell_script" "dependent" {
+				lifecycle_commands {
+					create = "echo -n"
+					read = "echo -n '{}'"
+					delete = "echo -n"
+				}
+
+				triggers = {
+					output = shell_script.shell_script.output["value"]
+				}
+			}	
+		`
+	}
+	return
+}