Merge pull request #94 from SumoLogic/ssain-add-vendor-and-bump-tf-sdk

seansain · web-flow · commit 9450fcb1f85f · 2019-11-08T14:22:55.000-08:00
migrate to the terraform plugin sdk
diff --git a/go.mod b/go.mod
@@ -5,5 +5,5 @@ go 1.12
 require (
 	github.com/go-errors/errors v1.0.1
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
-	github.com/hashicorp/terraform v0.12.0
+	github.com/hashicorp/terraform-plugin-sdk v1.0.0
 )
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/SumoLogic/sumologic-terraform-provider/sumologic"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 )
 
 func main() {
diff --git a/sumologic/data_source_sumologic_collector.go b/sumologic/data_source_sumologic_collector.go
@@ -3,7 +3,7 @@ package sumologic
 import (
 	"errors"
 	"fmt"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"strconv"
 )
diff --git a/sumologic/data_source_sumologic_collector_test.go b/sumologic/data_source_sumologic_collector_test.go
@@ -3,7 +3,7 @@ package sumologic
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourcSumologicCollector(t *testing.T) {
diff --git a/sumologic/data_source_sumologic_personal_folder.go b/sumologic/data_source_sumologic_personal_folder.go
@@ -1,7 +1,7 @@
 package sumologic
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceSumologicPersonalFolder() *schema.Resource {
diff --git a/sumologic/data_sumologic_source_caller_identity.go b/sumologic/data_sumologic_source_caller_identity.go
@@ -3,7 +3,7 @@ package sumologic
 import (
 	"time"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceSumologicCallerIdentity() *schema.Resource {
diff --git a/sumologic/provider.go b/sumologic/provider.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"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"
 )
 
 func Provider() terraform.ResourceProvider {
diff --git a/sumologic/provider_test.go b/sumologic/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
diff --git a/sumologic/resource_sumologic_cloudsyslog_source.go b/sumologic/resource_sumologic_cloudsyslog_source.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicCloudsyslogSource() *schema.Resource {
diff --git a/sumologic/resource_sumologic_cloudsyslog_source_test.go b/sumologic/resource_sumologic_cloudsyslog_source_test.go
@@ -3,8 +3,8 @@ package sumologic
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccSumologicCloudsyslogSource(t *testing.T) {
diff --git a/sumologic/resource_sumologic_collector.go b/sumologic/resource_sumologic_collector.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicCollector() *schema.Resource {
diff --git a/sumologic/resource_sumologic_collector_ingest_budget_assignment.go b/sumologic/resource_sumologic_collector_ingest_budget_assignment.go
@@ -2,7 +2,7 @@ package sumologic
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"strconv"
 )
diff --git a/sumologic/resource_sumologic_collector_test.go b/sumologic/resource_sumologic_collector_test.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccSumologicCollectorMinimal(t *testing.T) {
diff --git a/sumologic/resource_sumologic_content.go b/sumologic/resource_sumologic_content.go
@@ -2,7 +2,7 @@ package sumologic
 
 import (
 	"encoding/json"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"reflect"
 )
diff --git a/sumologic/resource_sumologic_content_test.go b/sumologic/resource_sumologic_content_test.go
@@ -7,8 +7,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 //Testing create functionality for Content resources
diff --git a/sumologic/resource_sumologic_extraction_rule.go b/sumologic/resource_sumologic_extraction_rule.go
@@ -14,7 +14,7 @@ package sumologic
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicFieldExtractionRule() *schema.Resource {
diff --git a/sumologic/resource_sumologic_extraction_rule_import_test.go b/sumologic/resource_sumologic_extraction_rule_import_test.go
@@ -16,7 +16,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestSumologicFieldExtractionRule_import(t *testing.T) {
diff --git a/sumologic/resource_sumologic_extraction_rule_test.go b/sumologic/resource_sumologic_extraction_rule_test.go
@@ -17,8 +17,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccFieldExtractionRuleCreate(t *testing.T) {
diff --git a/sumologic/resource_sumologic_folder.go b/sumologic/resource_sumologic_folder.go
@@ -3,7 +3,7 @@ package sumologic
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicFolder() *schema.Resource {
diff --git a/sumologic/resource_sumologic_folder_test.go b/sumologic/resource_sumologic_folder_test.go
@@ -5,9 +5,9 @@ import (
 	"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 TestAccFolderCreate(t *testing.T) {
diff --git a/sumologic/resource_sumologic_http_source.go b/sumologic/resource_sumologic_http_source.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicHTTPSource() *schema.Resource {
diff --git a/sumologic/resource_sumologic_http_source_test.go b/sumologic/resource_sumologic_http_source_test.go
@@ -3,8 +3,8 @@ package sumologic
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccSumologicHTTPSource(t *testing.T) {
diff --git a/sumologic/resource_sumologic_ingest_budget.go b/sumologic/resource_sumologic_ingest_budget.go
@@ -1,8 +1,8 @@
 package sumologic
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"log"
 )
 
diff --git a/sumologic/resource_sumologic_ingest_budget_test.go b/sumologic/resource_sumologic_ingest_budget_test.go
@@ -3,7 +3,7 @@ package sumologic
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccSumologicIngestBudget_basic(t *testing.T) {
diff --git a/sumologic/resource_sumologic_partition.go b/sumologic/resource_sumologic_partition.go
@@ -3,8 +3,8 @@ package sumologic
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func resourceSumologicPartition() *schema.Resource {
diff --git a/sumologic/resource_sumologic_partition_test.go b/sumologic/resource_sumologic_partition_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"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 TestAccSumoLogicPartition(t *testing.T) {
diff --git a/sumologic/resource_sumologic_polling_source.go b/sumologic/resource_sumologic_polling_source.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func resourceSumologicPollingSource() *schema.Resource {
diff --git a/sumologic/resource_sumologic_role.go b/sumologic/resource_sumologic_role.go
@@ -14,7 +14,7 @@ package sumologic
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicRole() *schema.Resource {
diff --git a/sumologic/resource_sumologic_role_import_test.go b/sumologic/resource_sumologic_role_import_test.go
@@ -16,7 +16,7 @@ import (
 	//"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestSumologicRole_import(t *testing.T) {
diff --git a/sumologic/resource_sumologic_role_test.go b/sumologic/resource_sumologic_role_test.go
@@ -17,8 +17,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccRoleCreate(t *testing.T) {
diff --git a/sumologic/resource_sumologic_scheduled_view.go b/sumologic/resource_sumologic_scheduled_view.go
@@ -1,8 +1,8 @@
 package sumologic
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"log"
 	"time"
 )
diff --git a/sumologic/resource_sumologic_user.go b/sumologic/resource_sumologic_user.go
@@ -14,7 +14,7 @@ package sumologic
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicUser() *schema.Resource {
diff --git a/sumologic/resource_sumologic_user_import_test.go b/sumologic/resource_sumologic_user_import_test.go
@@ -16,7 +16,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestSumologicUser_import(t *testing.T) {
diff --git a/sumologic/resource_sumologic_user_test.go b/sumologic/resource_sumologic_user_test.go
@@ -17,8 +17,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccUserCreate(t *testing.T) {
diff --git a/sumologic/sumologic_sources.go b/sumologic/sumologic_sources.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 type Source struct {

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ go 1.12`
`5`	`5`	`require (`
`6`	`6`	`github.com/go-errors/errors v1.0.1`
`7`	`7`	`github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect`
`8`		`- github.com/hashicorp/terraform v0.12.0`
	`8`	`+ github.com/hashicorp/terraform-plugin-sdk v1.0.0`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/SumoLogic/sumologic-terraform-provider/sumologic"`
`5`		`- "github.com/hashicorp/terraform/plugin"`
	`5`	`+ "github.com/hashicorp/terraform-plugin-sdk/plugin"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package sumologic`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`		`- "github.com/hashicorp/terraform/helper/schema"`
	`6`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`7`	`7`	`"log"`
`8`	`8`	`"strconv"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package sumologic`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/hashicorp/terraform/helper/resource"`
	`6`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/resource"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func TestAccDataSourcSumologicCollector(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package sumologic`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/hashicorp/terraform/helper/schema"`
	`4`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func dataSourceSumologicPersonalFolder() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package sumologic`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`	`5`
`6`		`- "github.com/hashicorp/terraform/helper/schema"`
	`6`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func dataSourceSumologicCallerIdentity() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"os"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/hashicorp/terraform/helper/schema"`
`8`		`- "github.com/hashicorp/terraform/terraform"`
	`7`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
	`8`	`+ "github.com/hashicorp/terraform-plugin-sdk/terraform"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var testAccProviders map[string]terraform.ResourceProvider`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"log"`
`5`	`5`	`"strconv"`
`6`	`6`
`7`		`- "github.com/hashicorp/terraform/helper/schema"`
	`7`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func resourceSumologicCloudsyslogSource() *schema.Resource {`