Skip to content

Commit 732b3f0

Browse files
nfxnfx
authored
Terraform Plugin SDK v2 Upgrade (#279)
* Terraform Plugin SDK v2 Upgrade - tests passing * Fixed some deprecations, but added nolint to others * Fix conflicts Co-authored-by: Serge Smertin <[email protected]>
1 parent 777e6ec commit 732b3f0

File tree

1,434 files changed

+120318
-128065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,434 files changed

+120318
-128065
lines changed

‎access/acceptance/permissions_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/databrickslabs/databricks-terraform/common"
99

1010
"github.com/databrickslabs/databricks-terraform/internal/acceptance"
11-
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
12-
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
11+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
12+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1313
"github.com/stretchr/testify/assert"
1414
)
1515

‎access/acceptance/secret_acl_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/databrickslabs/databricks-terraform/common"
1212
"github.com/databrickslabs/databricks-terraform/internal/acceptance"
13-
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
14-
"github.com/hashicorp/terraform-plugin-sdk/terraform"
13+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
14+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1515
"github.com/stretchr/testify/assert"
1616
)
1717

‎access/acceptance/secret_scope_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/databrickslabs/databricks-terraform/common"
1212
"github.com/databrickslabs/databricks-terraform/internal/acceptance"
13-
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
14-
"github.com/hashicorp/terraform-plugin-sdk/terraform"
13+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
14+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1515
"github.com/stretchr/testify/assert"
1616
)
1717

‎access/acceptance/secret_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"github.com/databrickslabs/databricks-terraform/common"
1212
"github.com/databrickslabs/databricks-terraform/internal/acceptance"
13-
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
14-
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
15-
"github.com/hashicorp/terraform-plugin-sdk/terraform"
13+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
14+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
15+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1616
"github.com/stretchr/testify/assert"
1717
)
1818

‎access/data_aws_policies.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"regexp"
77

8-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
9-
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
8+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1010
)
1111

1212
type awsIamPolicy struct {

‎access/resource_permissions.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/databrickslabs/databricks-terraform/common"
1010
"github.com/databrickslabs/databricks-terraform/identity"
1111
"github.com/databrickslabs/databricks-terraform/workspace"
12-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
12+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1313
"github.com/pkg/errors"
1414
)
1515

‎access/resource_permissions_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func TestResourcePermissionsCreate_no_access_control(t *testing.T) {
190190
"cluster_id": "abc",
191191
},
192192
}.Apply(t)
193-
qa.AssertErrorStartsWith(t, err, "Invalid config supplied. access_control: required field is not set")
193+
qa.AssertErrorStartsWith(t, err, "Invalid config supplied. Required attribute is not set")
194194
}
195195

196196
func TestResourcePermissionsCreate_conflicting_fields(t *testing.T) {

‎access/resource_secret.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88

99
"github.com/databrickslabs/databricks-terraform/common"
10-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
)
1212

1313
// ScopeBackendType is a custom type for the backend type for secret scopes

‎access/resource_secret_acl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"log"
55

66
"github.com/databrickslabs/databricks-terraform/common"
7-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
)
99

1010
// NewSecretAclsAPI creates SecretAclsAPI instance from provider meta

‎access/resource_secret_scope.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77

88
"github.com/databrickslabs/databricks-terraform/common"
9-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)
1111

1212
// NewSecretScopesAPI creates SecretScopesAPI instance from provider meta
@@ -67,7 +67,7 @@ func ResourceSecretScope() *schema.Resource {
6767
Read: resourceSecretScopeRead,
6868
Delete: resourceSecretScopeDelete,
6969
Importer: &schema.ResourceImporter{
70-
State: schema.ImportStatePassthrough,
70+
StateContext: schema.ImportStatePassthroughContext,
7171
},
7272
Schema: map[string]*schema.Schema{
7373
"name": {

0 commit comments

Comments
 (0)