Merge pull request #26 from logicmonitor/changes_to_publish_provider

logicmonitor · Jan 28, 2021 · d543a48 · d543a48
2 parents d64a903 + 746e601
commit d543a48
Show file tree

Hide file tree

Showing 14 changed files with 364 additions and 58 deletions.
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/terraform-providers/terraform-provider-logicmonitor
+module github.com/logicmonitor/terraform-provider-logicmonitor
 
 require (
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -12,8 +12,7 @@ require (
 	github.com/go-openapi/strfmt v0.19.0 // indirect
 	github.com/go-openapi/swag v0.19.0 // indirect
 	github.com/go-openapi/validate v0.19.0 // indirect
-	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
-	github.com/hashicorp/terraform-plugin-sdk v1.1.0
+	github.com/hashicorp/terraform-plugin-sdk v1.16.0
 	github.com/logicmonitor/lm-sdk-go v0.0.0-20190508172519-551e18072ac5
 	github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 // indirect
 )

diff --git a/go.sum b/go.sum
diff --git a/logicmonitor/data_source_dashboard.go b/logicmonitor/data_source_dashboard.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 	"github.com/logicmonitor/lm-sdk-go/client/lm"
 )

diff --git a/logicmonitor/data_source_dashboard_group.go b/logicmonitor/data_source_dashboard_group.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 	"github.com/logicmonitor/lm-sdk-go/client/lm"
 )

diff --git a/logicmonitor/data_source_dashboard_group_test.go b/logicmonitor/data_source_dashboard_group_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"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"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 )
 

diff --git a/logicmonitor/data_source_dashboard_test.go b/logicmonitor/data_source_dashboard_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"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"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 )
 

diff --git a/logicmonitor/import_dashboard_group_test.go b/logicmonitor/import_dashboard_group_test.go
@@ -3,7 +3,7 @@ package logicmonitor
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccLogicMonitorDashboardGroup_import(t *testing.T) {

diff --git a/logicmonitor/resource_dashboard.go b/logicmonitor/resource_dashboard.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 	"github.com/logicmonitor/lm-sdk-go/client/lm"
 )

diff --git a/logicmonitor/resource_dashboard_group.go b/logicmonitor/resource_dashboard_group.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 	"github.com/logicmonitor/lm-sdk-go/client/lm"
 )

diff --git a/logicmonitor/resource_dashboard_group_test.go b/logicmonitor/resource_dashboard_group_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"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 	"github.com/logicmonitor/lm-sdk-go/client/lm"
 )

diff --git a/logicmonitor/resource_dashboard_test.go b/logicmonitor/resource_dashboard_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"
 	lmclient "github.com/logicmonitor/lm-sdk-go/client"
 	"github.com/logicmonitor/lm-sdk-go/client/lm"
 )

diff --git a/main.go b/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/plugin"
-	"github.com/terraform-providers/terraform-provider-logicmonitor/logicmonitor"
+	"github.com/logicmonitor/terraform-provider-logicmonitor/logicmonitor"
 )
 
 func main() {

diff --git a/scripts/changelog-links.sh b/scripts/changelog-links.sh
@@ -24,7 +24,7 @@ else
   SED="sed -i.bak -r -e"
 fi
 
-PROVIDER_URL="https:\/\/github.com\/terraform-providers\/terraform-provider-logicmonitor\/issues"
+PROVIDER_URL="https:\/\/github.com\/logicmonitor\/terraform-provider-logicmonitor\/issues"
 
 $SED "s/GH-([0-9]+)/\[#\1\]\($PROVIDER_URL\/\1\)/g" -e 's/\[\[#(.+)([0-9])\)]$/(\[#\1\2))/g' CHANGELOG.md
 

diff --git a/scripts/errcheck.sh b/scripts/errcheck.sh
@@ -9,7 +9,7 @@ if ! which errcheck > /dev/null; then
 fi
 
 err_files=$(errcheck -ignoretests \
-                     -ignore 'github.com/hashicorp/terraform/helper/schema:Set' \
+                     -ignore 'github.com/hashicorp/terraform-plugin-sdk/helper/schema:Set' \
                      -ignore 'bytes:.*' \
                      -ignore 'io:Close|Write' \
                      $(go list ./...| grep -v /vendor/))