Merge pull request #15 from scottwinkler/feature/triggers

add triggers attribute and updates for provider sdk

examples/test.tf

@@ -1,5 +1,6 @@
 provider "shell" {}
 
+
 //test complete data resource 
 data "shell_script" "test" {
   lifecycle_commands {
@@ -84,12 +85,32 @@ resource "shell_script" "test5" {
 
   working_directory = "${path.module}"
 
-  environment {
+  environment = {
     yolo = "yolo"
     ball = "room"
   }
 }
 
 output "commit_id2" {
   value = shell_script.test5.output["commit_id"]
+}
+
+//resource with triggers
+resource "shell_script" "test6" {
+  lifecycle_commands {
+    create = file("${path.module}/scripts/create.sh")
+    read   = file("${path.module}/scripts/read.sh")
+    delete = file("${path.module}/scripts/delete.sh")
+  }
+
+  working_directory = "${path.module}"
+
+  environment = {
+    yolo = "yolo"
+    ball = "room"
+  }
+
+  triggers = {
+    abc = 123
+  }
 }

go.mod

@@ -1,12 +1,16 @@
-module githubdev.dco.elmae/CloudPlatform/terraform-provider-shell
+module github.com/scottwinkler/terraform-provider-shell
 
 go 1.12
 
 require (
 	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
-	github.com/hashicorp/terraform v0.12.0
+	github.com/blang/semver v0.0.0-20170202183821-4a1e882c79dc // indirect
+	github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
+	github.com/hashicorp/terraform v0.11.11 // indirect
+	github.com/hashicorp/terraform-plugin-sdk v1.0.0
+	github.com/kisielk/gotool v1.0.0 // indirect
+	github.com/mitchellh/hashstructure v0.0.0-20160209213820-6b17d669fac5 // indirect
 	github.com/rs/xid v1.2.1
-	github.com/scottwinkler/terraform-provider-shell v0.0.0-20190308051913-56533de967fb
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 	"github.com/scottwinkler/terraform-provider-shell/shell"
 )
 

shell/data_source_shell_script.go

@@ -3,7 +3,7 @@ package shell
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/rs/xid"
 )
 

shell/data_source_shell_script_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccShellDataShellScript_basic(t *testing.T) {

shell/provider.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/hashicorp/terraform/helper/mutexkv"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/mutexkv"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 // Provider returns a terraform.ResourceProvider.

shell/provider_test.go

@@ -3,8 +3,8 @@ package shell
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 var testAccProviders map[string]terraform.ResourceProvider
@@ -25,4 +25,4 @@ func TestProvider(t *testing.T) {
 
 func TestProvider_impl(t *testing.T) {
 	var _ terraform.ResourceProvider = Provider()
-}
+}

shell/resource_shell_script.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"reflect"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/rs/xid"
 )
 
@@ -45,6 +45,11 @@ func resourceShellScript() *schema.Resource {
 					},
 				},
 			},
+			"triggers": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				ForceNew: true,
+			},
 			"environment": {
 				Type:     schema.TypeMap,
 				Optional: true,

shell/resource_shell_script_test.go

@@ -2,11 +2,12 @@ package shell
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccShellShellScript_basic(t *testing.T) {
@@ -90,15 +91,15 @@ func TestAccShellShellScript_complete(t *testing.T) {
 }
 
 func testAccCheckShellScriptDestroy(s *terraform.State) error {
-	/*for _, rs := range s.RootModule().Resources {
+	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "shell_script" {
 			continue
 		}
 		fileName := rs.Primary.Attributes["shell_script.test.environment.filename"]
 		if _, err := os.Stat(fileName); os.IsExist(err) {
 			return fmt.Errorf("Shell Script file failed to cleanup")
 		}
-	}*/
+	}
 	return nil
 }
 
@@ -185,6 +186,10 @@ func testAccShellScriptConfig_complete(outValue string) string {
 			testdatasize = "10240"						
 			out1 = "%s"
 		}
+
+		triggers = {
+			key = "value"
+		}
 	  }
 `, outValue)
 }