I just wanted to update ulikunitz/xz v0.5.5 -> v0.5.8

They said it will be oneliner
Scalr · Oct 21, 2021 · 8fd78da · 8fd78da
1 parent 951d625
commit 8fd78da
Show file tree

Hide file tree

Showing 52 changed files with 545 additions and 343 deletions.
diff --git a/go.mod b/go.mod
@@ -1,11 +1,10 @@
 module github.com/scalr/terraform-provider-scalr
 
 require (
-	github.com/hashicorp/go-hclog v0.0.0-20190109152822-4783caec6f2e // indirect
-	github.com/hashicorp/go-version v1.2.0
+	github.com/hashicorp/go-version v1.3.0
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
-	github.com/hashicorp/terraform v0.12.0
-	github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596
+	github.com/hashicorp/terraform-plugin-sdk v1.17.2
+	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/scalr/go-scalr v0.0.0-20211018102309-4005678cc9ff
 )

diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 	"github.com/scalr/terraform-provider-scalr/scalr"
 )
 

diff --git a/scalr/data_source_current_run.go b/scalr/data_source_current_run.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_current_run_test.go b/scalr/data_source_current_run_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_endpoint.go b/scalr/data_source_endpoint.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_endpoint_test.go b/scalr/data_source_endpoint_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccEndpointDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_environment.go b/scalr/data_source_environment.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_environment_test.go b/scalr/data_source_environment_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccEnvironmentDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_module_version.go b/scalr/data_source_module_version.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_module_version_test.go b/scalr/data_source_module_version_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_scalr_access_policy.go b/scalr/data_source_scalr_access_policy.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_scalr_access_policy_test.go b/scalr/data_source_scalr_access_policy_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccScalrAccessPolicyDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_scalr_agent_pool.go b/scalr/data_source_scalr_agent_pool.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_scalr_agent_pool_test.go b/scalr/data_source_scalr_agent_pool_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccScalrAgentPoolDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_scalr_role.go b/scalr/data_source_scalr_role.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_scalr_role_test.go b/scalr/data_source_scalr_role_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"
 )
 
 func TestAccScalrRoleDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_scalr_vcs_provider.go b/scalr/data_source_scalr_vcs_provider.go
@@ -2,7 +2,8 @@ package scalr
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/schema"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_scalr_vcs_provider_test.go b/scalr/data_source_scalr_vcs_provider_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccScalrVcsProviderDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_webhook.go b/scalr/data_source_webhook.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_webhook_test.go b/scalr/data_source_webhook_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccWebhookDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_workspace.go b/scalr/data_source_workspace.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_workspace_ids.go b/scalr/data_source_workspace_ids.go
@@ -3,7 +3,7 @@ package scalr
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/data_source_workspace_ids_test.go b/scalr/data_source_workspace_ids_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccScalrWorkspaceIDsDataSource_basic(t *testing.T) {

diff --git a/scalr/data_source_workspace_test.go b/scalr/data_source_workspace_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccScalrWorkspaceDataSource_basic(t *testing.T) {

diff --git a/scalr/provider.go b/scalr/provider.go
@@ -13,12 +13,12 @@ import (
 
 	version "github.com/hashicorp/go-version"
 	"github.com/hashicorp/hcl"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/logging"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	svchost "github.com/hashicorp/terraform-svchost"
 	"github.com/hashicorp/terraform-svchost/auth"
 	"github.com/hashicorp/terraform-svchost/disco"
-	"github.com/hashicorp/terraform/helper/logging"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
 	scalr "github.com/scalr/go-scalr"
 	providerVersion "github.com/scalr/terraform-provider-scalr/version"
 )

diff --git a/scalr/provider_test.go b/scalr/provider_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/hashicorp/terraform-svchost/disco"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
 	"github.com/scalr/terraform-provider-scalr/version"
 )
 

diff --git a/scalr/resource_scalr_access_policy.go b/scalr/resource_scalr_access_policy.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_access_policy_test.go b/scalr/resource_scalr_access_policy_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"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"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_agent_pool.go b/scalr/resource_scalr_agent_pool.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_agent_pool_test.go b/scalr/resource_scalr_agent_pool_test.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"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"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_agent_pool_token.go b/scalr/resource_scalr_agent_pool_token.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_agent_pool_token_test.go b/scalr/resource_scalr_agent_pool_token_test.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"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"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_endpoint.go b/scalr/resource_scalr_endpoint.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_endpoint_migrate.go b/scalr/resource_scalr_endpoint_migrate.go
@@ -1,7 +1,7 @@
 package scalr
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceScalrEndpointResourceV0() *schema.Resource {

diff --git a/scalr/resource_scalr_endpoint_test.go b/scalr/resource_scalr_endpoint_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccEndpoint_basic(t *testing.T) {

diff --git a/scalr/resource_scalr_environment.go b/scalr/resource_scalr_environment.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_environment_test.go b/scalr/resource_scalr_environment_test.go
@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"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"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_module.go b/scalr/resource_scalr_module.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_module_test.go b/scalr/resource_scalr_module_test.go
@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"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"
 	"github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_role.go b/scalr/resource_scalr_role.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"sort"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	scalr "github.com/scalr/go-scalr"
 )
 

diff --git a/scalr/resource_scalr_role_test.go b/scalr/resource_scalr_role_test.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"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"
 	scalr "github.com/scalr/go-scalr"
 )