diff --git a/go.mod b/go.mod index 7e516afb..a38fd3dd 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/hashicorp/terraform-plugin-docs v0.13.0 - github.com/hashicorp/terraform-plugin-framework v0.17.0 - github.com/hashicorp/terraform-plugin-framework-validators v0.7.0 + github.com/hashicorp/terraform-plugin-framework v1.0.0 + github.com/hashicorp/terraform-plugin-framework-validators v0.8.0 github.com/hashicorp/terraform-plugin-go v0.14.2 github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 ) diff --git a/go.sum b/go.sum index cab81515..ad9665ff 100644 --- a/go.sum +++ b/go.sum @@ -120,10 +120,10 @@ github.com/hashicorp/terraform-json v0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e github.com/hashicorp/terraform-json v0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM= github.com/hashicorp/terraform-plugin-docs v0.13.0 h1:6e+VIWsVGb6jYJewfzq2ok2smPzZrt1Wlm9koLeKazY= github.com/hashicorp/terraform-plugin-docs v0.13.0/go.mod h1:W0oCmHAjIlTHBbvtppWHe8fLfZ2BznQbuv8+UD8OucQ= -github.com/hashicorp/terraform-plugin-framework v0.17.0 h1:0KUOY/oe1GPLFqaXnKDnd1rhCrnUtt8pV9wGEwNUFlU= -github.com/hashicorp/terraform-plugin-framework v0.17.0/go.mod h1:FV97t2BZOARkL7NNlsc/N25c84MyeSSz72uPp7Vq1lg= -github.com/hashicorp/terraform-plugin-framework-validators v0.7.0 h1:tIYOMNmEMQIc6mwun8nX3e5U3TkgZg1TpXRlBEBQHwY= -github.com/hashicorp/terraform-plugin-framework-validators v0.7.0/go.mod h1:e1RKREyEVdd3FK8Jfgz8L/ThQgcJKLb4ZJxNzsuIH0A= +github.com/hashicorp/terraform-plugin-framework v1.0.0 h1:0Mls4TrMTrDysBUby/UmlbcTOMM+n5JBDyB5k+XkGWg= +github.com/hashicorp/terraform-plugin-framework v1.0.0/go.mod h1:FV97t2BZOARkL7NNlsc/N25c84MyeSSz72uPp7Vq1lg= +github.com/hashicorp/terraform-plugin-framework-validators v0.8.0 h1:hKCuQMjD7W7reAoWn6GLkNwrDNjY9RCBWQZOJxe5LlQ= +github.com/hashicorp/terraform-plugin-framework-validators v0.8.0/go.mod h1:qkrZ542jRiCwwl3ZN/3eTKhGJ4HIBkSxGXnjJoAWtxo= github.com/hashicorp/terraform-plugin-go v0.14.2 h1:rhsVEOGCnY04msNymSvbUsXfRLKh9znXZmHlf5e8mhE= github.com/hashicorp/terraform-plugin-go v0.14.2/go.mod h1:Q12UjumPNGiFsZffxOsA40Tlz1WVXt2Evh865Zj0+UA= github.com/hashicorp/terraform-plugin-log v0.7.0 h1:SDxJUyT8TwN4l5b5/VkiTIaQgY6R+Y2BQ0sRZftGKQs= diff --git a/internal/localtypes/file_permission.go b/internal/localtypes/file_permission.go deleted file mode 100644 index 88e1fa19..00000000 --- a/internal/localtypes/file_permission.go +++ /dev/null @@ -1,9 +0,0 @@ -package localtypes - -import ( - "github.com/hashicorp/terraform-plugin-framework/types" -) - -type FilePermission struct { - types.String -} diff --git a/internal/localtypes/file_permission_type.go b/internal/localtypes/file_permission_type.go index bdf537ae..90f9f820 100644 --- a/internal/localtypes/file_permission_type.go +++ b/internal/localtypes/file_permission_type.go @@ -8,20 +8,21 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-go/tftypes" ) var ( - _ types.StringTypable = FilePermissionType{} - _ xattr.TypeWithValidate = FilePermissionType{} + _ basetypes.StringTypable = FilePermissionType{} + _ xattr.TypeWithValidate = FilePermissionType{} ) type FilePermissionType struct { - types.StringTypable + basetypes.StringType } func NewFilePermissionType() FilePermissionType { - return FilePermissionType{StringTypable: types.StringType} + return FilePermissionType{StringType: types.StringType} } // Validate checks that the given input string is a valid file permission string, diff --git a/internal/provider/data_source_local_file.go b/internal/provider/data_source_local_file.go index 74ec6fcf..de24e2f4 100644 --- a/internal/provider/data_source_local_file.go +++ b/internal/provider/data_source_local_file.go @@ -14,8 +14,7 @@ import ( ) var ( - _ datasource.DataSource = (*localFileDataSource)(nil) - _ datasource.DataSourceWithSchema = (*localFileDataSource)(nil) + _ datasource.DataSource = (*localFileDataSource)(nil) ) func NewLocalFileDataSource() datasource.DataSource { diff --git a/internal/provider/data_source_local_sensitive_file.go b/internal/provider/data_source_local_sensitive_file.go index 1fc0ac9c..12927d0f 100644 --- a/internal/provider/data_source_local_sensitive_file.go +++ b/internal/provider/data_source_local_sensitive_file.go @@ -8,11 +8,10 @@ import ( ) var ( - _ datasource.DataSource = (*localSensitiveFileDataSource)(nil) - _ datasource.DataSourceWithSchema = (*localSensitiveFileDataSource)(nil) + _ datasource.DataSource = (*localSensitiveFileDataSource)(nil) ) -func NewLocalSensitiveFileDataSourceWithSchema() datasource.DataSourceWithSchema { +func NewLocalSensitiveFileDataSourceWithSchema() datasource.DataSource { return &localSensitiveFileDataSource{} } diff --git a/internal/provider/provider.go b/internal/provider/provider.go index be4d8c7e..3339a592 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -10,9 +10,7 @@ import ( ) var ( - _ provider.Provider = (*localProvider)(nil) - _ provider.ProviderWithSchema = (*localProvider)(nil) - _ provider.ProviderWithMetadata = (*localProvider)(nil) + _ provider.Provider = (*localProvider)(nil) ) func New() provider.Provider { diff --git a/internal/provider/resource_local_file.go b/internal/provider/resource_local_file.go index 28f1a9d8..03553b1d 100644 --- a/internal/provider/resource_local_file.go +++ b/internal/provider/resource_local_file.go @@ -24,8 +24,7 @@ import ( ) var ( - _ resource.Resource = (*localFileResource)(nil) - _ resource.ResourceWithSchema = (*localFileResource)(nil) + _ resource.Resource = (*localFileResource)(nil) ) func NewLocalFileResource() resource.Resource { diff --git a/internal/provider/resource_local_sensitive_file.go b/internal/provider/resource_local_sensitive_file.go index 20822eef..8ed77e1b 100644 --- a/internal/provider/resource_local_sensitive_file.go +++ b/internal/provider/resource_local_sensitive_file.go @@ -24,8 +24,7 @@ import ( ) var ( - _ resource.Resource = (*localSensitiveFileResource)(nil) - _ resource.ResourceWithSchema = (*localSensitiveFileResource)(nil) + _ resource.Resource = (*localSensitiveFileResource)(nil) ) func NewLocalSensitiveFileResource() resource.Resource {