Merge pull request #2 from tidal-engineering/feature/bump-sdk

bump sdk

go.mod

@@ -1,15 +1,14 @@
-module github.com/armory-io/terraform-provider-spinnaker
+module github.com/tidal-engineering/terraform-provider-spinnaker
 
-go 1.12
+go 1.14
 
 require (
-	cloud.google.com/go v0.37.4 // indirect
 	github.com/ghodss/yaml v1.0.0
-	github.com/hashicorp/terraform v0.12.0
-	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+	github.com/hashicorp/terraform-plugin-sdk v1.7.0
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/spf13/pflag v1.0.3
 	github.com/spinnaker/spin v0.0.0-20190530150642-535d2dc1b985
+	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/armory-io/terraform-provider-spinnaker/spinnaker"
-	"github.com/hashicorp/terraform/plugin"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker"
+	"github.com/hashicorp/terraform-plugin-sdk/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func main() {

spinnaker/datasource_pipeline.go

@@ -1,7 +1,7 @@
 package spinnaker
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func datasourcePipeline() *schema.Resource {

spinnaker/provider.go

@@ -1,12 +1,13 @@
 package spinnaker
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/spf13/pflag"
 	gate "github.com/spinnaker/spin/cmd/gateclient"
 )
 
-func Provider() *schema.Provider {
+func Provider() terraform.ResourceProvider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"server": {

spinnaker/provider_test.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"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
@@ -22,7 +22,7 @@ func testAccPreCheck(t *testing.T) {
 	if os.Getenv("GATE_URL") == "" {
 		t.Fatal("GATE_URL must be set for acceptance tests")
 	}
-	err := testAccProvider.Configure(terraform.NewResourceConfig(nil))
+	err := testAccProvider.Configure(terraform.NewResourceConfigRaw(nil))
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}

spinnaker/resource_application.go

@@ -3,8 +3,8 @@ package spinnaker
 import (
 	"strings"
 
-	"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceApplication() *schema.Resource {

spinnaker/resource_application_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"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 TestAccSpinnakerApplication_basic(t *testing.T) {

spinnaker/resource_pipeline.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourcePipeline() *schema.Resource {

spinnaker/resource_pipeline_template.go

@@ -7,9 +7,9 @@ import (
 	"log"
 	"reflect"
 
-	"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
+	"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
 	"github.com/ghodss/yaml"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourcePipelineTemplate() *schema.Resource {

spinnaker/resource_pipeline_template_config.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
+	"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
 	"github.com/ghodss/yaml"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type PipelineConfig struct {