diff --git a/go.mod b/go.mod index e06880a81b..021c9b590b 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/hashicorp/go-hclog v0.16.1 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/hcl/v2 v2.10.0 - github.com/hashicorp/terraform-plugin-framework v0.2.1-0.20210817164910-fad6afe33058 + github.com/hashicorp/terraform-plugin-framework v0.3.1-0.20210915151717-8de1d13d8636 github.com/hashicorp/terraform-plugin-go v0.3.1 github.com/hashicorp/terraform-plugin-log v0.1.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0 @@ -27,5 +27,3 @@ require ( replace github.com/aws/aws-sdk-go-v2/service/cloudformation => github.com/hashicorp/aws-sdk-go-v2-service-cloudformation-private v0.0.0-20210723211334-303716fc7a60 replace github.com/aws/aws-sdk-go-v2/credentials => github.com/gdavison/aws-sdk-go-v2/credentials v1.2.2-0.20210811194025-146c1ad6c3b2 - -replace github.com/hashicorp/terraform-plugin-framework => github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210908155737-cef60d646d77 diff --git a/go.sum b/go.sum index b886ee2c13..b167fd5413 100644 --- a/go.sum +++ b/go.sum @@ -111,16 +111,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8P3k= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210819181743-98573f653e5d h1:1j4zeLO52zW+Hx0b44yf1+TE/kexWuHGAN4HMSIk6l8= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210819181743-98573f653e5d/go.mod h1:JcYLIMJDUnOrPRSdbjRsNaJcOExNuPdZ6MS+OIBHjyE= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210902181543-57c53acf8fa2 h1:jCOQrEj10ZOjkp0BACJ0i/xAqPr+L0PugAR7cb9dDwc= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210902181543-57c53acf8fa2/go.mod h1:JcYLIMJDUnOrPRSdbjRsNaJcOExNuPdZ6MS+OIBHjyE= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210902190237-e20bf3555d0c h1:HhE2mW8Ao+XRk7BCGhKF80dEB3r+YxMoaVLKI0IJr1Q= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210902190237-e20bf3555d0c/go.mod h1:JcYLIMJDUnOrPRSdbjRsNaJcOExNuPdZ6MS+OIBHjyE= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210908121805-ccf7ab658548 h1:XUFwM1ZpRawpDcEWKFE+tnNwHOoria0Hiq/e7SAum+Y= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210908121805-ccf7ab658548/go.mod h1:9pDOoxcGdAKOjDWUpa+QOpj2npeJvgf4imnwYBTwIq8= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210908155737-cef60d646d77 h1:EqGVXBO/5nVzp5OqTHUDn86isb8kXiRRxSPSRIg/3tc= -github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210908155737-cef60d646d77/go.mod h1:9pDOoxcGdAKOjDWUpa+QOpj2npeJvgf4imnwYBTwIq8= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -197,18 +187,6 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.7.0 h1:nO9Y6UnkUgvAy3TS7sJqppy4LO0zIc+zi8epvjkL8T0= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.7.0/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.7.1-0.20210826174716-21de2a0867b1 h1:yzmSuZiqGH5tLUI0EC7dG0+IG6+g6kVJXl2dbu+1EYY= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.7.1-0.20210826174716-21de2a0867b1/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.0 h1:sUaZUUq7r9owaOMQ3kFG202FELYIbW6DG7ecK10cVwg= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.0/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.1-0.20210910183347-8713658faf12 h1:bftpT2/YjC9IzDjNst4vIOYRHRXbxoAwYrHpJp8vGJw= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.1-0.20210910183347-8713658faf12/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.1-0.20210913191004-c44ebf3a5d32 h1:98ZbzMskzBAyvhMVkIcR4LTU0vYfYhsdfaGX1u1Ijw8= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.1-0.20210913191004-c44ebf3a5d32/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.1-0.20210913195356-51c9a36c4c93 h1:9wCylqklZUAGqCPtIH4WnzoXOJbd0tAMM7lYmS/rlPM= -github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.8.1-0.20210913195356-51c9a36c4c93/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.9.0 h1:tmfUGbj6/nQxYZJWmUoY0NoGMLZBgDcyl+OlH9+vbcE= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.9.0/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= github.com/hashicorp/aws-sdk-go-base v0.7.2-0.20210812222230-308b29e49974 h1:nP8GUCBRDCgWQK/L08YdzAK9h8KBn8Y8LEoH4WLxCw4= @@ -256,6 +234,8 @@ github.com/hashicorp/terraform-exec v0.14.0 h1:UQoUcxKTZZXhyyK68Cwn4mApT4mnFPmEX github.com/hashicorp/terraform-exec v0.14.0/go.mod h1:qrAASDq28KZiMPDnQ02sFS9udcqEkRly002EA2izXTA= github.com/hashicorp/terraform-json v0.12.0 h1:8czPgEEWWPROStjkWPUnTQDXmpmZPlkQAwYYLETaTvw= github.com/hashicorp/terraform-json v0.12.0/go.mod h1:pmbq9o4EuL43db5+0ogX10Yofv1nozM+wskr/bGFJpI= +github.com/hashicorp/terraform-plugin-framework v0.3.1-0.20210915151717-8de1d13d8636 h1:8uvoTk6iufPS0+e8t1APwwtrXcoVXaImO0HRIMDMv8w= +github.com/hashicorp/terraform-plugin-framework v0.3.1-0.20210915151717-8de1d13d8636/go.mod h1:9pDOoxcGdAKOjDWUpa+QOpj2npeJvgf4imnwYBTwIq8= github.com/hashicorp/terraform-plugin-go v0.3.0/go.mod h1:dFHsQMaTLpON2gWhVWT96fvtlc/MF1vSy3OdMhWBzdM= github.com/hashicorp/terraform-plugin-go v0.3.1 h1:ML+THFcqpdR049gqrbEFDFo99va2Wqw9g4XDPy51euU= github.com/hashicorp/terraform-plugin-go v0.3.1/go.mod h1:dFHsQMaTLpON2gWhVWT96fvtlc/MF1vSy3OdMhWBzdM= diff --git a/internal/aws/accessanalyzer/analyzer_plural_data_source_gen.go b/internal/aws/accessanalyzer/analyzer_plural_data_source_gen.go index d594bf5fa8..89237ac12c 100644 --- a/internal/aws/accessanalyzer/analyzer_plural_data_source_gen.go +++ b/internal/aws/accessanalyzer/analyzer_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func analyzersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/accessanalyzer/analyzer_resource_gen.go b/internal/aws/accessanalyzer/analyzer_resource_gen.go index 0d79f3caa5..06d086afd8 100644 --- a/internal/aws/accessanalyzer/analyzer_resource_gen.go +++ b/internal/aws/accessanalyzer/analyzer_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -212,7 +211,7 @@ func analyzerResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -233,7 +232,7 @@ func analyzerResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/accessanalyzer/analyzer_singular_data_source_gen.go b/internal/aws/accessanalyzer/analyzer_singular_data_source_gen.go index 28f3729f25..bb108cd0af 100644 --- a/internal/aws/accessanalyzer/analyzer_singular_data_source_gen.go +++ b/internal/aws/accessanalyzer/analyzer_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -187,7 +186,7 @@ func analyzerDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -202,7 +201,7 @@ func analyzerDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/acmpca/certificate_resource_gen.go b/internal/aws/acmpca/certificate_resource_gen.go index c3caf368f0..cc9ae4dc3b 100644 --- a/internal/aws/acmpca/certificate_resource_gen.go +++ b/internal/aws/acmpca/certificate_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/amplify/app_resource_gen.go b/internal/aws/amplify/app_resource_gen.go index 7abafa1d2b..73a86f9d87 100644 --- a/internal/aws/amplify/app_resource_gen.go +++ b/internal/aws/amplify/app_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/amplify/branch_resource_gen.go b/internal/aws/amplify/branch_resource_gen.go index 2aa950f84f..25029351fe 100644 --- a/internal/aws/amplify/branch_resource_gen.go +++ b/internal/aws/amplify/branch_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/amplify/domain_resource_gen.go b/internal/aws/amplify/domain_resource_gen.go index 727ff95257..64172336f1 100644 --- a/internal/aws/amplify/domain_resource_gen.go +++ b/internal/aws/amplify/domain_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/apigateway/api_key_plural_data_source_gen.go b/internal/aws/apigateway/api_key_plural_data_source_gen.go index ce10e78d73..55ec8f7768 100644 --- a/internal/aws/apigateway/api_key_plural_data_source_gen.go +++ b/internal/aws/apigateway/api_key_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func apiKeysDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/apigateway/api_key_resource_gen.go b/internal/aws/apigateway/api_key_resource_gen.go index c7d986ea45..6216a4f3ee 100644 --- a/internal/aws/apigateway/api_key_resource_gen.go +++ b/internal/aws/apigateway/api_key_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/apigateway/client_certificate_plural_data_source_gen.go b/internal/aws/apigateway/client_certificate_plural_data_source_gen.go index c32552e014..bd59c1eb74 100644 --- a/internal/aws/apigateway/client_certificate_plural_data_source_gen.go +++ b/internal/aws/apigateway/client_certificate_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func clientCertificatesDataSourceType(ctx context.Context) (tfsdk.DataSourceType }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/apigateway/documentation_version_resource_gen.go b/internal/aws/apigateway/documentation_version_resource_gen.go index cd2b53100c..c790567ae9 100644 --- a/internal/aws/apigateway/documentation_version_resource_gen.go +++ b/internal/aws/apigateway/documentation_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/apigateway/domain_name_plural_data_source_gen.go b/internal/aws/apigateway/domain_name_plural_data_source_gen.go index 4c8d856472..5705318e5b 100644 --- a/internal/aws/apigateway/domain_name_plural_data_source_gen.go +++ b/internal/aws/apigateway/domain_name_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func domainNamesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/apigateway/usage_plan_key_resource_gen.go b/internal/aws/apigateway/usage_plan_key_resource_gen.go index 6f494ad814..74c195ddd9 100644 --- a/internal/aws/apigateway/usage_plan_key_resource_gen.go +++ b/internal/aws/apigateway/usage_plan_key_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/appflow/connector_profile_plural_data_source_gen.go b/internal/aws/appflow/connector_profile_plural_data_source_gen.go index bfc1fd2a5d..7a387bd0bd 100644 --- a/internal/aws/appflow/connector_profile_plural_data_source_gen.go +++ b/internal/aws/appflow/connector_profile_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func connectorProfilesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/appflow/connector_profile_resource_gen.go b/internal/aws/appflow/connector_profile_resource_gen.go index e56b09ed2c..492a1b8bdb 100644 --- a/internal/aws/appflow/connector_profile_resource_gen.go +++ b/internal/aws/appflow/connector_profile_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/appflow/flow_plural_data_source_gen.go b/internal/aws/appflow/flow_plural_data_source_gen.go index 599ae5c6bc..2cd06e201a 100644 --- a/internal/aws/appflow/flow_plural_data_source_gen.go +++ b/internal/aws/appflow/flow_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func flowsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/appflow/flow_resource_gen.go b/internal/aws/appflow/flow_resource_gen.go index 2aa176f155..843c04ae47 100644 --- a/internal/aws/appflow/flow_resource_gen.go +++ b/internal/aws/appflow/flow_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/appintegrations/event_integration_plural_data_source_gen.go b/internal/aws/appintegrations/event_integration_plural_data_source_gen.go index cfec707108..e554d0d373 100644 --- a/internal/aws/appintegrations/event_integration_plural_data_source_gen.go +++ b/internal/aws/appintegrations/event_integration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func eventIntegrationsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/appintegrations/event_integration_resource_gen.go b/internal/aws/appintegrations/event_integration_resource_gen.go index c37d88486f..b216bde4e6 100644 --- a/internal/aws/appintegrations/event_integration_resource_gen.go +++ b/internal/aws/appintegrations/event_integration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/applicationinsights/application_plural_data_source_gen.go b/internal/aws/applicationinsights/application_plural_data_source_gen.go index 41e72a4fc2..362df3cead 100644 --- a/internal/aws/applicationinsights/application_plural_data_source_gen.go +++ b/internal/aws/applicationinsights/application_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func applicationsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/applicationinsights/application_resource_gen.go b/internal/aws/applicationinsights/application_resource_gen.go index d77bbabb97..b54629bea4 100644 --- a/internal/aws/applicationinsights/application_resource_gen.go +++ b/internal/aws/applicationinsights/application_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/apprunner/service_plural_data_source_gen.go b/internal/aws/apprunner/service_plural_data_source_gen.go index 8fbcb7a6d3..5ad3941eb5 100644 --- a/internal/aws/apprunner/service_plural_data_source_gen.go +++ b/internal/aws/apprunner/service_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func servicesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/apprunner/service_resource_gen.go b/internal/aws/apprunner/service_resource_gen.go index f7c079918a..2b6e8022ad 100644 --- a/internal/aws/apprunner/service_resource_gen.go +++ b/internal/aws/apprunner/service_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/athena/data_catalog_resource_gen.go b/internal/aws/athena/data_catalog_resource_gen.go index b7433fa299..dbeb402369 100644 --- a/internal/aws/athena/data_catalog_resource_gen.go +++ b/internal/aws/athena/data_catalog_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/athena/named_query_plural_data_source_gen.go b/internal/aws/athena/named_query_plural_data_source_gen.go index 3243381dbb..556364b184 100644 --- a/internal/aws/athena/named_query_plural_data_source_gen.go +++ b/internal/aws/athena/named_query_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func namedQueriesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/athena/named_query_resource_gen.go b/internal/aws/athena/named_query_resource_gen.go index 9359b61c76..f7633815bf 100644 --- a/internal/aws/athena/named_query_resource_gen.go +++ b/internal/aws/athena/named_query_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/athena/prepared_statement_resource_gen.go b/internal/aws/athena/prepared_statement_resource_gen.go index 6e98941304..e1b714ef1c 100644 --- a/internal/aws/athena/prepared_statement_resource_gen.go +++ b/internal/aws/athena/prepared_statement_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/athena/work_group_plural_data_source_gen.go b/internal/aws/athena/work_group_plural_data_source_gen.go index 6ea32a5557..aa8bd52e71 100644 --- a/internal/aws/athena/work_group_plural_data_source_gen.go +++ b/internal/aws/athena/work_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func workGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/athena/work_group_resource_gen.go b/internal/aws/athena/work_group_resource_gen.go index 12adb95d17..6143e5769d 100644 --- a/internal/aws/athena/work_group_resource_gen.go +++ b/internal/aws/athena/work_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/auditmanager/assessment_resource_gen.go b/internal/aws/auditmanager/assessment_resource_gen.go index 56e6d09dfb..890a9589b2 100644 --- a/internal/aws/auditmanager/assessment_resource_gen.go +++ b/internal/aws/auditmanager/assessment_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/budgets/budgets_action_plural_data_source_gen.go b/internal/aws/budgets/budgets_action_plural_data_source_gen.go index 57638edd60..4a77158a92 100644 --- a/internal/aws/budgets/budgets_action_plural_data_source_gen.go +++ b/internal/aws/budgets/budgets_action_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func budgetsActionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/budgets/budgets_action_resource_gen.go b/internal/aws/budgets/budgets_action_resource_gen.go index a1a219d01c..d32dd8531b 100644 --- a/internal/aws/budgets/budgets_action_resource_gen.go +++ b/internal/aws/budgets/budgets_action_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cassandra/keyspace_plural_data_source_gen.go b/internal/aws/cassandra/keyspace_plural_data_source_gen.go index 09dac11037..334886b894 100644 --- a/internal/aws/cassandra/keyspace_plural_data_source_gen.go +++ b/internal/aws/cassandra/keyspace_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func keyspacesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cassandra/keyspace_resource_gen.go b/internal/aws/cassandra/keyspace_resource_gen.go index 80c4a8a49e..b2dbec696b 100644 --- a/internal/aws/cassandra/keyspace_resource_gen.go +++ b/internal/aws/cassandra/keyspace_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cassandra/table_plural_data_source_gen.go b/internal/aws/cassandra/table_plural_data_source_gen.go index f4f2229cbc..25a1fc92ef 100644 --- a/internal/aws/cassandra/table_plural_data_source_gen.go +++ b/internal/aws/cassandra/table_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func tablesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cassandra/table_resource_gen.go b/internal/aws/cassandra/table_resource_gen.go index e85ea78cb6..f99eca5406 100644 --- a/internal/aws/cassandra/table_resource_gen.go +++ b/internal/aws/cassandra/table_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -360,7 +359,7 @@ func tableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "Non-key columns of the table", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "column_name": { // Property: ColumnName @@ -373,7 +372,7 @@ func tableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/cassandra/table_singular_data_source_gen.go b/internal/aws/cassandra/table_singular_data_source_gen.go index dc52a8c8a5..a3651e2eb3 100644 --- a/internal/aws/cassandra/table_singular_data_source_gen.go +++ b/internal/aws/cassandra/table_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -305,7 +304,7 @@ func tableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "Non-key columns of the table", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "column_name": { // Property: ColumnName @@ -318,7 +317,7 @@ func tableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ce/cost_category_resource_gen.go b/internal/aws/ce/cost_category_resource_gen.go index 97fcb76a14..888d3c6a85 100644 --- a/internal/aws/ce/cost_category_resource_gen.go +++ b/internal/aws/ce/cost_category_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/certificatemanager/account_resource_gen.go b/internal/aws/certificatemanager/account_resource_gen.go index ff2504ea54..1cf8d17ed0 100644 --- a/internal/aws/certificatemanager/account_resource_gen.go +++ b/internal/aws/certificatemanager/account_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/chatbot/slack_channel_configuration_plural_data_source_gen.go b/internal/aws/chatbot/slack_channel_configuration_plural_data_source_gen.go index d4518cab0f..65c2669ea1 100644 --- a/internal/aws/chatbot/slack_channel_configuration_plural_data_source_gen.go +++ b/internal/aws/chatbot/slack_channel_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func slackChannelConfigurationsDataSourceType(ctx context.Context) (tfsdk.DataSo }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/chatbot/slack_channel_configuration_resource_gen.go b/internal/aws/chatbot/slack_channel_configuration_resource_gen.go index fa0db8d9c9..d2a627cbf4 100644 --- a/internal/aws/chatbot/slack_channel_configuration_resource_gen.go +++ b/internal/aws/chatbot/slack_channel_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudformation/module_default_version_resource_gen.go b/internal/aws/cloudformation/module_default_version_resource_gen.go index 30c55fd109..47615dd979 100644 --- a/internal/aws/cloudformation/module_default_version_resource_gen.go +++ b/internal/aws/cloudformation/module_default_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudformation/module_version_plural_data_source_gen.go b/internal/aws/cloudformation/module_version_plural_data_source_gen.go index 7b359ba0ba..e9ac5c14bd 100644 --- a/internal/aws/cloudformation/module_version_plural_data_source_gen.go +++ b/internal/aws/cloudformation/module_version_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func moduleVersionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudformation/public_type_version_plural_data_source_gen.go b/internal/aws/cloudformation/public_type_version_plural_data_source_gen.go index 65a5110c0c..3087012f8b 100644 --- a/internal/aws/cloudformation/public_type_version_plural_data_source_gen.go +++ b/internal/aws/cloudformation/public_type_version_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func publicTypeVersionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudformation/public_type_version_resource_gen.go b/internal/aws/cloudformation/public_type_version_resource_gen.go index d426569de6..013378c26d 100644 --- a/internal/aws/cloudformation/public_type_version_resource_gen.go +++ b/internal/aws/cloudformation/public_type_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudformation/resource_default_version_resource_gen.go b/internal/aws/cloudformation/resource_default_version_resource_gen.go index c12aaffe87..69a4cd3f0b 100644 --- a/internal/aws/cloudformation/resource_default_version_resource_gen.go +++ b/internal/aws/cloudformation/resource_default_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudformation/resource_version_resource_gen.go b/internal/aws/cloudformation/resource_version_resource_gen.go index 018775bba7..9d2869cb2a 100644 --- a/internal/aws/cloudformation/resource_version_resource_gen.go +++ b/internal/aws/cloudformation/resource_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudformation/stack_set_resource_gen.go b/internal/aws/cloudformation/stack_set_resource_gen.go index 68942d5a14..4170f61693 100644 --- a/internal/aws/cloudformation/stack_set_resource_gen.go +++ b/internal/aws/cloudformation/stack_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -112,7 +111,7 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "In some cases, you must explicitly acknowledge that your stack set template contains certain capabilities in order for AWS CloudFormation to create the stack set and related stack instances.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "description": { @@ -274,7 +273,7 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "The input parameters for the stack set template.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "parameter_key": { // Property: ParameterKey @@ -289,7 +288,7 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -402,7 +401,7 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A group of stack instances with parameters in some specific accounts and regions.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "deployment_targets": { // Property: DeploymentTargets @@ -412,13 +411,13 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { "accounts": { // Property: Accounts Description: "AWS accounts that you want to create stack instances in the specified Region(s) for.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "organizational_unit_ids": { // Property: OrganizationalUnitIds Description: "The organization root ID or organizational unit (OU) IDs to which StackSets deploys.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, @@ -428,7 +427,7 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { "parameter_overrides": { // Property: ParameterOverrides Description: "A list of stack set parameters whose values you want to override in the selected stack instances.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "parameter_key": { // Property: ParameterKey @@ -443,18 +442,18 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "regions": { // Property: Regions Description: "The names of one or more Regions where you want to create stack instances using the specified AWS account(s).", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -523,7 +522,7 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "The key-value pairs to associate with this stack set and the stacks created from it. AWS CloudFormation also propagates these tags to supported resources that are created in the stacks. A maximum number of 50 tags can be specified.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -544,7 +543,7 @@ func stackSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/cloudformation/stack_set_singular_data_source_gen.go b/internal/aws/cloudformation/stack_set_singular_data_source_gen.go index 08a4f255e4..10a0c92dfa 100644 --- a/internal/aws/cloudformation/stack_set_singular_data_source_gen.go +++ b/internal/aws/cloudformation/stack_set_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -101,7 +100,7 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "In some cases, you must explicitly acknowledge that your stack set template contains certain capabilities in order for AWS CloudFormation to create the stack set and related stack instances.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "description": { @@ -238,7 +237,7 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "The input parameters for the stack set template.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "parameter_key": { // Property: ParameterKey @@ -253,7 +252,7 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -357,7 +356,7 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "A group of stack instances with parameters in some specific accounts and regions.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "deployment_targets": { // Property: DeploymentTargets @@ -367,13 +366,13 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { "accounts": { // Property: Accounts Description: "AWS accounts that you want to create stack instances in the specified Region(s) for.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "organizational_unit_ids": { // Property: OrganizationalUnitIds Description: "The organization root ID or organizational unit (OU) IDs to which StackSets deploys.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -383,7 +382,7 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { "parameter_overrides": { // Property: ParameterOverrides Description: "A list of stack set parameters whose values you want to override in the selected stack instances.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "parameter_key": { // Property: ParameterKey @@ -398,18 +397,18 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "regions": { // Property: Regions Description: "The names of one or more Regions where you want to create stack instances using the specified AWS account(s).", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -472,7 +471,7 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "The key-value pairs to associate with this stack set and the stacks created from it. AWS CloudFormation also propagates these tags to supported resources that are created in the stacks. A maximum number of 50 tags can be specified.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -487,7 +486,7 @@ func stackSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/cloudformation/type_activation_plural_data_source_gen.go b/internal/aws/cloudformation/type_activation_plural_data_source_gen.go index 217cd8feb7..591f0751a8 100644 --- a/internal/aws/cloudformation/type_activation_plural_data_source_gen.go +++ b/internal/aws/cloudformation/type_activation_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func typeActivationsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudformation/type_activation_resource_gen.go b/internal/aws/cloudformation/type_activation_resource_gen.go index c375e1d23f..7d2a0c5f76 100644 --- a/internal/aws/cloudformation/type_activation_resource_gen.go +++ b/internal/aws/cloudformation/type_activation_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudfront/cache_policy_plural_data_source_gen.go b/internal/aws/cloudfront/cache_policy_plural_data_source_gen.go index d51d55abfa..bbbd057591 100644 --- a/internal/aws/cloudfront/cache_policy_plural_data_source_gen.go +++ b/internal/aws/cloudfront/cache_policy_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func cachePoliciesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/cache_policy_resource_gen.go b/internal/aws/cloudfront/cache_policy_resource_gen.go index f55f3b6725..7a29f788ab 100644 --- a/internal/aws/cloudfront/cache_policy_resource_gen.go +++ b/internal/aws/cloudfront/cache_policy_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudfront/cloudfront_origin_access_identity_plural_data_source_gen.go b/internal/aws/cloudfront/cloudfront_origin_access_identity_plural_data_source_gen.go index 761c08df34..1c23e93abe 100644 --- a/internal/aws/cloudfront/cloudfront_origin_access_identity_plural_data_source_gen.go +++ b/internal/aws/cloudfront/cloudfront_origin_access_identity_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func cloudFrontOriginAccessIdentitiesDataSourceType(ctx context.Context) (tfsdk. }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/distribution_plural_data_source_gen.go b/internal/aws/cloudfront/distribution_plural_data_source_gen.go index 0770787f88..0aba12c881 100644 --- a/internal/aws/cloudfront/distribution_plural_data_source_gen.go +++ b/internal/aws/cloudfront/distribution_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func distributionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/function_plural_data_source_gen.go b/internal/aws/cloudfront/function_plural_data_source_gen.go index 392786cd98..1d5bf895aa 100644 --- a/internal/aws/cloudfront/function_plural_data_source_gen.go +++ b/internal/aws/cloudfront/function_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func functionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/key_group_plural_data_source_gen.go b/internal/aws/cloudfront/key_group_plural_data_source_gen.go index 003ac1388f..05fbac501c 100644 --- a/internal/aws/cloudfront/key_group_plural_data_source_gen.go +++ b/internal/aws/cloudfront/key_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func keyGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/origin_request_policy_plural_data_source_gen.go b/internal/aws/cloudfront/origin_request_policy_plural_data_source_gen.go index 3f3356c470..60038d0b8c 100644 --- a/internal/aws/cloudfront/origin_request_policy_plural_data_source_gen.go +++ b/internal/aws/cloudfront/origin_request_policy_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func originRequestPoliciesDataSourceType(ctx context.Context) (tfsdk.DataSourceT }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/public_key_plural_data_source_gen.go b/internal/aws/cloudfront/public_key_plural_data_source_gen.go index c3fff193d9..909df54e46 100644 --- a/internal/aws/cloudfront/public_key_plural_data_source_gen.go +++ b/internal/aws/cloudfront/public_key_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func publicKeysDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/realtime_log_config_plural_data_source_gen.go b/internal/aws/cloudfront/realtime_log_config_plural_data_source_gen.go index dad7906db7..88097621c6 100644 --- a/internal/aws/cloudfront/realtime_log_config_plural_data_source_gen.go +++ b/internal/aws/cloudfront/realtime_log_config_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func realtimeLogConfigsDataSourceType(ctx context.Context) (tfsdk.DataSourceType }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudfront/realtime_log_config_resource_gen.go b/internal/aws/cloudfront/realtime_log_config_resource_gen.go index 40a8076efe..95df318de5 100644 --- a/internal/aws/cloudfront/realtime_log_config_resource_gen.go +++ b/internal/aws/cloudfront/realtime_log_config_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudtrail/trail_plural_data_source_gen.go b/internal/aws/cloudtrail/trail_plural_data_source_gen.go index 213127beb9..a417b0fdc2 100644 --- a/internal/aws/cloudtrail/trail_plural_data_source_gen.go +++ b/internal/aws/cloudtrail/trail_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func trailsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudtrail/trail_resource_gen.go b/internal/aws/cloudtrail/trail_resource_gen.go index a361b93519..959c1becac 100644 --- a/internal/aws/cloudtrail/trail_resource_gen.go +++ b/internal/aws/cloudtrail/trail_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -131,11 +130,11 @@ func trailResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "Use event selectors to further specify the management and data event settings for your trail. By default, trails created without specific event selectors will be configured to log all read and write management events, and no data events. When an event occurs in your account, CloudTrail evaluates the event selector for all trails. For each trail, if the event matches any event selector, the trail processes and logs the event. If the event doesn't match any event selector, the trail doesn't log the event. You can configure up to five event selectors for a trail.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "data_resources": { // Property: DataResources - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "type": { // Property: Type @@ -146,18 +145,18 @@ func trailResourceType(ctx context.Context) (tfsdk.ResourceType, error) { "values": { // Property: Values Description: "An array of Amazon Resource Name (ARN) strings or partial ARN strings for the specified objects.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "exclude_management_event_sources": { // Property: ExcludeManagementEventSources Description: "An optional list of service event sources from which you do not want management events to be logged on your trail. In this release, the list can be empty (disables the filter), or it can filter out AWS Key Management Service events by containing \"kms.amazonaws.com\". By default, ExcludeManagementEventSources is empty, and AWS KMS events are included in events that are logged to your trail.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "include_management_events": { @@ -180,7 +179,7 @@ func trailResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 5, }, ), @@ -218,7 +217,7 @@ func trailResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "Lets you enable Insights event logging by specifying the Insights selectors that you want to enable on an existing trail.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "insight_type": { // Property: InsightType @@ -227,7 +226,7 @@ func trailResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/cloudtrail/trail_singular_data_source_gen.go b/internal/aws/cloudtrail/trail_singular_data_source_gen.go index 29d091a532..f552c690b7 100644 --- a/internal/aws/cloudtrail/trail_singular_data_source_gen.go +++ b/internal/aws/cloudtrail/trail_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -130,11 +129,11 @@ func trailDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "Use event selectors to further specify the management and data event settings for your trail. By default, trails created without specific event selectors will be configured to log all read and write management events, and no data events. When an event occurs in your account, CloudTrail evaluates the event selector for all trails. For each trail, if the event matches any event selector, the trail processes and logs the event. If the event doesn't match any event selector, the trail doesn't log the event. You can configure up to five event selectors for a trail.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "data_resources": { // Property: DataResources - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "type": { // Property: Type @@ -145,18 +144,18 @@ func trailDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { "values": { // Property: Values Description: "An array of Amazon Resource Name (ARN) strings or partial ARN strings for the specified objects.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "exclude_management_event_sources": { // Property: ExcludeManagementEventSources Description: "An optional list of service event sources from which you do not want management events to be logged on your trail. In this release, the list can be empty (disables the filter), or it can filter out AWS Key Management Service events by containing \"kms.amazonaws.com\". By default, ExcludeManagementEventSources is empty, and AWS KMS events are included in events that are logged to your trail.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "include_management_events": { @@ -172,7 +171,7 @@ func trailDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -208,7 +207,7 @@ func trailDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "Lets you enable Insights event logging by specifying the Insights selectors that you want to enable on an existing trail.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "insight_type": { // Property: InsightType @@ -217,7 +216,7 @@ func trailDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/cloudwatch/composite_alarm_plural_data_source_gen.go b/internal/aws/cloudwatch/composite_alarm_plural_data_source_gen.go index 2fc138fb3c..38413d4aa0 100644 --- a/internal/aws/cloudwatch/composite_alarm_plural_data_source_gen.go +++ b/internal/aws/cloudwatch/composite_alarm_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func compositeAlarmsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudwatch/composite_alarm_resource_gen.go b/internal/aws/cloudwatch/composite_alarm_resource_gen.go index 0658ed15cd..049162b171 100644 --- a/internal/aws/cloudwatch/composite_alarm_resource_gen.go +++ b/internal/aws/cloudwatch/composite_alarm_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/cloudwatch/metric_stream_plural_data_source_gen.go b/internal/aws/cloudwatch/metric_stream_plural_data_source_gen.go index b08ab70a3f..862acdc203 100644 --- a/internal/aws/cloudwatch/metric_stream_plural_data_source_gen.go +++ b/internal/aws/cloudwatch/metric_stream_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func metricStreamsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/cloudwatch/metric_stream_resource_gen.go b/internal/aws/cloudwatch/metric_stream_resource_gen.go index bcb54f285c..de5178ab56 100644 --- a/internal/aws/cloudwatch/metric_stream_resource_gen.go +++ b/internal/aws/cloudwatch/metric_stream_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/codeartifact/domain_plural_data_source_gen.go b/internal/aws/codeartifact/domain_plural_data_source_gen.go index fbe41e4190..b8c5502d24 100644 --- a/internal/aws/codeartifact/domain_plural_data_source_gen.go +++ b/internal/aws/codeartifact/domain_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func domainsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/codeartifact/domain_resource_gen.go b/internal/aws/codeartifact/domain_resource_gen.go index f1254656b3..32caff99ba 100644 --- a/internal/aws/codeartifact/domain_resource_gen.go +++ b/internal/aws/codeartifact/domain_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/codeartifact/repository_plural_data_source_gen.go b/internal/aws/codeartifact/repository_plural_data_source_gen.go index 441921fc98..5c4e4d3a43 100644 --- a/internal/aws/codeartifact/repository_plural_data_source_gen.go +++ b/internal/aws/codeartifact/repository_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func repositoriesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/codeartifact/repository_resource_gen.go b/internal/aws/codeartifact/repository_resource_gen.go index 81e30b70be..0cb9b3d0fa 100644 --- a/internal/aws/codeartifact/repository_resource_gen.go +++ b/internal/aws/codeartifact/repository_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/codeguruprofiler/profiling_group_plural_data_source_gen.go b/internal/aws/codeguruprofiler/profiling_group_plural_data_source_gen.go index 0771e8d304..ffe4d24f79 100644 --- a/internal/aws/codeguruprofiler/profiling_group_plural_data_source_gen.go +++ b/internal/aws/codeguruprofiler/profiling_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func profilingGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/codeguruprofiler/profiling_group_resource_gen.go b/internal/aws/codeguruprofiler/profiling_group_resource_gen.go index d1d6d667ab..c9210c7f4b 100644 --- a/internal/aws/codeguruprofiler/profiling_group_resource_gen.go +++ b/internal/aws/codeguruprofiler/profiling_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/codegurureviewer/repository_association_resource_gen.go b/internal/aws/codegurureviewer/repository_association_resource_gen.go index 32f5f8ebf7..b93a8943df 100644 --- a/internal/aws/codegurureviewer/repository_association_resource_gen.go +++ b/internal/aws/codegurureviewer/repository_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/codestarconnections/connection_plural_data_source_gen.go b/internal/aws/codestarconnections/connection_plural_data_source_gen.go index b438c82c5f..da8a55a993 100644 --- a/internal/aws/codestarconnections/connection_plural_data_source_gen.go +++ b/internal/aws/codestarconnections/connection_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func connectionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/codestarconnections/connection_resource_gen.go b/internal/aws/codestarconnections/connection_resource_gen.go index 13643fc559..97e01ffadd 100644 --- a/internal/aws/codestarconnections/connection_resource_gen.go +++ b/internal/aws/codestarconnections/connection_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/codestarnotifications/notification_rule_resource_gen.go b/internal/aws/codestarnotifications/notification_rule_resource_gen.go index e06a9dd1a2..c749e64558 100644 --- a/internal/aws/codestarnotifications/notification_rule_resource_gen.go +++ b/internal/aws/codestarnotifications/notification_rule_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/config/configuration_aggregator_plural_data_source_gen.go b/internal/aws/config/configuration_aggregator_plural_data_source_gen.go index 7d806e17d4..dc6ef8060c 100644 --- a/internal/aws/config/configuration_aggregator_plural_data_source_gen.go +++ b/internal/aws/config/configuration_aggregator_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func configurationAggregatorsDataSourceType(ctx context.Context) (tfsdk.DataSour }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/config/configuration_aggregator_resource_gen.go b/internal/aws/config/configuration_aggregator_resource_gen.go index f1786e3581..a6c156a5c1 100644 --- a/internal/aws/config/configuration_aggregator_resource_gen.go +++ b/internal/aws/config/configuration_aggregator_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/config/conformance_pack_plural_data_source_gen.go b/internal/aws/config/conformance_pack_plural_data_source_gen.go index c767422dc8..d2cee1c9bb 100644 --- a/internal/aws/config/conformance_pack_plural_data_source_gen.go +++ b/internal/aws/config/conformance_pack_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func conformancePacksDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/config/conformance_pack_resource_gen.go b/internal/aws/config/conformance_pack_resource_gen.go index 0b69137055..aa70e12df8 100644 --- a/internal/aws/config/conformance_pack_resource_gen.go +++ b/internal/aws/config/conformance_pack_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/config/organization_conformance_pack_plural_data_source_gen.go b/internal/aws/config/organization_conformance_pack_plural_data_source_gen.go index f0f7b18500..9cb6ba7c1a 100644 --- a/internal/aws/config/organization_conformance_pack_plural_data_source_gen.go +++ b/internal/aws/config/organization_conformance_pack_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func organizationConformancePacksDataSourceType(ctx context.Context) (tfsdk.Data }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/config/organization_conformance_pack_resource_gen.go b/internal/aws/config/organization_conformance_pack_resource_gen.go index 77e788c2b4..2c3e050850 100644 --- a/internal/aws/config/organization_conformance_pack_resource_gen.go +++ b/internal/aws/config/organization_conformance_pack_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/config/stored_query_plural_data_source_gen.go b/internal/aws/config/stored_query_plural_data_source_gen.go index 33333a660b..11fc4bf36e 100644 --- a/internal/aws/config/stored_query_plural_data_source_gen.go +++ b/internal/aws/config/stored_query_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func storedQueriesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/config/stored_query_resource_gen.go b/internal/aws/config/stored_query_resource_gen.go index a23b01e26d..5fdda35334 100644 --- a/internal/aws/config/stored_query_resource_gen.go +++ b/internal/aws/config/stored_query_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/connect/quick_connect_resource_gen.go b/internal/aws/connect/quick_connect_resource_gen.go index abed291000..8bcaa6970c 100644 --- a/internal/aws/connect/quick_connect_resource_gen.go +++ b/internal/aws/connect/quick_connect_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -267,7 +266,7 @@ func quickConnectResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "One or more tags.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -288,7 +287,7 @@ func quickConnectResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 200, }, ), diff --git a/internal/aws/connect/quick_connect_singular_data_source_gen.go b/internal/aws/connect/quick_connect_singular_data_source_gen.go index a44e50218f..1b36a6b6ac 100644 --- a/internal/aws/connect/quick_connect_singular_data_source_gen.go +++ b/internal/aws/connect/quick_connect_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -253,7 +252,7 @@ func quickConnectDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro // "uniqueItems": true // } Description: "One or more tags.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -268,7 +267,7 @@ func quickConnectDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/customerprofiles/domain_plural_data_source_gen.go b/internal/aws/customerprofiles/domain_plural_data_source_gen.go index eb24c199fe..a74d82f861 100644 --- a/internal/aws/customerprofiles/domain_plural_data_source_gen.go +++ b/internal/aws/customerprofiles/domain_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func domainsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/customerprofiles/domain_resource_gen.go b/internal/aws/customerprofiles/domain_resource_gen.go index abe89133d0..98c2aff9af 100644 --- a/internal/aws/customerprofiles/domain_resource_gen.go +++ b/internal/aws/customerprofiles/domain_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/customerprofiles/integration_resource_gen.go b/internal/aws/customerprofiles/integration_resource_gen.go index d0e76b3552..dad46d80d3 100644 --- a/internal/aws/customerprofiles/integration_resource_gen.go +++ b/internal/aws/customerprofiles/integration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/customerprofiles/object_type_resource_gen.go b/internal/aws/customerprofiles/object_type_resource_gen.go index 823859b9b9..907b21f52b 100644 --- a/internal/aws/customerprofiles/object_type_resource_gen.go +++ b/internal/aws/customerprofiles/object_type_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/databrew/dataset_plural_data_source_gen.go b/internal/aws/databrew/dataset_plural_data_source_gen.go index fac7776dbd..096c0136a5 100644 --- a/internal/aws/databrew/dataset_plural_data_source_gen.go +++ b/internal/aws/databrew/dataset_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func datasetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/databrew/dataset_resource_gen.go b/internal/aws/databrew/dataset_resource_gen.go index c67102cbc8..d37ef74a46 100644 --- a/internal/aws/databrew/dataset_resource_gen.go +++ b/internal/aws/databrew/dataset_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/databrew/job_plural_data_source_gen.go b/internal/aws/databrew/job_plural_data_source_gen.go index faa4e3616a..d842343501 100644 --- a/internal/aws/databrew/job_plural_data_source_gen.go +++ b/internal/aws/databrew/job_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func jobsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/databrew/job_resource_gen.go b/internal/aws/databrew/job_resource_gen.go index 8a22a9be6b..84f7cfbc3a 100644 --- a/internal/aws/databrew/job_resource_gen.go +++ b/internal/aws/databrew/job_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/databrew/project_plural_data_source_gen.go b/internal/aws/databrew/project_plural_data_source_gen.go index d27258e8e6..0c5df7c7ed 100644 --- a/internal/aws/databrew/project_plural_data_source_gen.go +++ b/internal/aws/databrew/project_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func projectsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/databrew/project_resource_gen.go b/internal/aws/databrew/project_resource_gen.go index 009d30f824..c46d33e6f2 100644 --- a/internal/aws/databrew/project_resource_gen.go +++ b/internal/aws/databrew/project_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/databrew/recipe_plural_data_source_gen.go b/internal/aws/databrew/recipe_plural_data_source_gen.go index bea9bdea2e..40d99c5e30 100644 --- a/internal/aws/databrew/recipe_plural_data_source_gen.go +++ b/internal/aws/databrew/recipe_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func recipesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/databrew/schedule_plural_data_source_gen.go b/internal/aws/databrew/schedule_plural_data_source_gen.go index 6a6efab8fe..19383953de 100644 --- a/internal/aws/databrew/schedule_plural_data_source_gen.go +++ b/internal/aws/databrew/schedule_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func schedulesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/databrew/schedule_resource_gen.go b/internal/aws/databrew/schedule_resource_gen.go index 49671dfabc..4f85127b86 100644 --- a/internal/aws/databrew/schedule_resource_gen.go +++ b/internal/aws/databrew/schedule_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/datasync/agent_plural_data_source_gen.go b/internal/aws/datasync/agent_plural_data_source_gen.go index 94f313f22c..f78041de6c 100644 --- a/internal/aws/datasync/agent_plural_data_source_gen.go +++ b/internal/aws/datasync/agent_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func agentsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/agent_resource_gen.go b/internal/aws/datasync/agent_resource_gen.go index f6261e29b2..dc132e6c7d 100644 --- a/internal/aws/datasync/agent_resource_gen.go +++ b/internal/aws/datasync/agent_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -167,7 +166,7 @@ func agentResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -188,7 +187,7 @@ func agentResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/agent_singular_data_source_gen.go b/internal/aws/datasync/agent_singular_data_source_gen.go index 3c12643e47..1ec89d2e17 100644 --- a/internal/aws/datasync/agent_singular_data_source_gen.go +++ b/internal/aws/datasync/agent_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -146,7 +145,7 @@ func agentDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -161,7 +160,7 @@ func agentDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/datasync/location_efs_plural_data_source_gen.go b/internal/aws/datasync/location_efs_plural_data_source_gen.go index 5f6faa7179..9c58b00037 100644 --- a/internal/aws/datasync/location_efs_plural_data_source_gen.go +++ b/internal/aws/datasync/location_efs_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func locationEFSPluralDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/location_efs_resource_gen.go b/internal/aws/datasync/location_efs_resource_gen.go index 2e645bd3cd..0054400d1c 100644 --- a/internal/aws/datasync/location_efs_resource_gen.go +++ b/internal/aws/datasync/location_efs_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -187,7 +186,7 @@ func locationEFSResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -208,7 +207,7 @@ func locationEFSResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/location_efs_singular_data_source_gen.go b/internal/aws/datasync/location_efs_singular_data_source_gen.go index 77af9d6d60..c0a5b61d6d 100644 --- a/internal/aws/datasync/location_efs_singular_data_source_gen.go +++ b/internal/aws/datasync/location_efs_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -159,7 +158,7 @@ func locationEFSDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -174,7 +173,7 @@ func locationEFSDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/datasync/location_fsx_windows_plural_data_source_gen.go b/internal/aws/datasync/location_fsx_windows_plural_data_source_gen.go index 07f9dcc09d..b303969d57 100644 --- a/internal/aws/datasync/location_fsx_windows_plural_data_source_gen.go +++ b/internal/aws/datasync/location_fsx_windows_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func locationFSxWindowsPluralDataSourceType(ctx context.Context) (tfsdk.DataSour }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/location_fsx_windows_resource_gen.go b/internal/aws/datasync/location_fsx_windows_resource_gen.go index 34b80fbcb7..b32dcb680a 100644 --- a/internal/aws/datasync/location_fsx_windows_resource_gen.go +++ b/internal/aws/datasync/location_fsx_windows_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -185,7 +184,7 @@ func locationFSxWindowsResourceType(ctx context.Context) (tfsdk.ResourceType, er // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -206,7 +205,7 @@ func locationFSxWindowsResourceType(ctx context.Context) (tfsdk.ResourceType, er }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/location_fsx_windows_singular_data_source_gen.go b/internal/aws/datasync/location_fsx_windows_singular_data_source_gen.go index b374182935..2db295882f 100644 --- a/internal/aws/datasync/location_fsx_windows_singular_data_source_gen.go +++ b/internal/aws/datasync/location_fsx_windows_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -151,7 +150,7 @@ func locationFSxWindowsDataSourceType(ctx context.Context) (tfsdk.DataSourceType // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -166,7 +165,7 @@ func locationFSxWindowsDataSourceType(ctx context.Context) (tfsdk.DataSourceType Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/datasync/location_nfs_plural_data_source_gen.go b/internal/aws/datasync/location_nfs_plural_data_source_gen.go index 3ac988138a..cf8d33ed8f 100644 --- a/internal/aws/datasync/location_nfs_plural_data_source_gen.go +++ b/internal/aws/datasync/location_nfs_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func locationNFSPluralDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/location_nfs_resource_gen.go b/internal/aws/datasync/location_nfs_resource_gen.go index 6d184cd6d9..416f2f6ef0 100644 --- a/internal/aws/datasync/location_nfs_resource_gen.go +++ b/internal/aws/datasync/location_nfs_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -221,7 +220,7 @@ func locationNFSResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -242,7 +241,7 @@ func locationNFSResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/location_nfs_singular_data_source_gen.go b/internal/aws/datasync/location_nfs_singular_data_source_gen.go index f2e13fa627..1b757b1440 100644 --- a/internal/aws/datasync/location_nfs_singular_data_source_gen.go +++ b/internal/aws/datasync/location_nfs_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -182,7 +181,7 @@ func locationNFSDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -197,7 +196,7 @@ func locationNFSDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/datasync/location_object_storage_plural_data_source_gen.go b/internal/aws/datasync/location_object_storage_plural_data_source_gen.go index 429e255112..02cc41d23d 100644 --- a/internal/aws/datasync/location_object_storage_plural_data_source_gen.go +++ b/internal/aws/datasync/location_object_storage_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func locationObjectStoragesDataSourceType(ctx context.Context) (tfsdk.DataSource }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/location_object_storage_resource_gen.go b/internal/aws/datasync/location_object_storage_resource_gen.go index eed312d1c8..a5a7947b9b 100644 --- a/internal/aws/datasync/location_object_storage_resource_gen.go +++ b/internal/aws/datasync/location_object_storage_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -238,7 +237,7 @@ func locationObjectStorageResourceType(ctx context.Context) (tfsdk.ResourceType, // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -259,7 +258,7 @@ func locationObjectStorageResourceType(ctx context.Context) (tfsdk.ResourceType, }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/location_object_storage_singular_data_source_gen.go b/internal/aws/datasync/location_object_storage_singular_data_source_gen.go index a74523fc3f..2a73d4c580 100644 --- a/internal/aws/datasync/location_object_storage_singular_data_source_gen.go +++ b/internal/aws/datasync/location_object_storage_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -197,7 +196,7 @@ func locationObjectStorageDataSourceType(ctx context.Context) (tfsdk.DataSourceT // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -212,7 +211,7 @@ func locationObjectStorageDataSourceType(ctx context.Context) (tfsdk.DataSourceT Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/datasync/location_s3_plural_data_source_gen.go b/internal/aws/datasync/location_s3_plural_data_source_gen.go index 6fb35e320c..44ae099190 100644 --- a/internal/aws/datasync/location_s3_plural_data_source_gen.go +++ b/internal/aws/datasync/location_s3_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func locationS3sDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/location_s3_resource_gen.go b/internal/aws/datasync/location_s3_resource_gen.go index 9369fa5395..1833c49db5 100644 --- a/internal/aws/datasync/location_s3_resource_gen.go +++ b/internal/aws/datasync/location_s3_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -197,7 +196,7 @@ func locationS3ResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -218,7 +217,7 @@ func locationS3ResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/location_s3_singular_data_source_gen.go b/internal/aws/datasync/location_s3_singular_data_source_gen.go index 0596fdc704..a483db3c0e 100644 --- a/internal/aws/datasync/location_s3_singular_data_source_gen.go +++ b/internal/aws/datasync/location_s3_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -160,7 +159,7 @@ func locationS3DataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -175,7 +174,7 @@ func locationS3DataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/datasync/location_smb_plural_data_source_gen.go b/internal/aws/datasync/location_smb_plural_data_source_gen.go index 6d39319213..3cf2c76d1a 100644 --- a/internal/aws/datasync/location_smb_plural_data_source_gen.go +++ b/internal/aws/datasync/location_smb_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func locationSMBSDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/location_smb_resource_gen.go b/internal/aws/datasync/location_smb_resource_gen.go index c54b00eb07..b96d3fa7e0 100644 --- a/internal/aws/datasync/location_smb_resource_gen.go +++ b/internal/aws/datasync/location_smb_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -233,7 +232,7 @@ func locationSMBResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -254,7 +253,7 @@ func locationSMBResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/location_smb_singular_data_source_gen.go b/internal/aws/datasync/location_smb_singular_data_source_gen.go index 4fa62036fb..c315f6e00a 100644 --- a/internal/aws/datasync/location_smb_singular_data_source_gen.go +++ b/internal/aws/datasync/location_smb_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -188,7 +187,7 @@ func locationSMBDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -203,7 +202,7 @@ func locationSMBDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/datasync/task_plural_data_source_gen.go b/internal/aws/datasync/task_plural_data_source_gen.go index bcca5d90d8..f8c8fa97bf 100644 --- a/internal/aws/datasync/task_plural_data_source_gen.go +++ b/internal/aws/datasync/task_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func tasksDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/datasync/task_resource_gen.go b/internal/aws/datasync/task_resource_gen.go index 55c0e4bf87..37dc2cfe22 100644 --- a/internal/aws/datasync/task_resource_gen.go +++ b/internal/aws/datasync/task_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -614,7 +613,7 @@ func taskResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -635,7 +634,7 @@ func taskResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/datasync/task_singular_data_source_gen.go b/internal/aws/datasync/task_singular_data_source_gen.go index 522c61b7a8..cb316ea8d7 100644 --- a/internal/aws/datasync/task_singular_data_source_gen.go +++ b/internal/aws/datasync/task_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -483,7 +482,7 @@ func taskDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -498,7 +497,7 @@ func taskDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/detective/graph_plural_data_source_gen.go b/internal/aws/detective/graph_plural_data_source_gen.go index d2d6f9877b..46dad32ed9 100644 --- a/internal/aws/detective/graph_plural_data_source_gen.go +++ b/internal/aws/detective/graph_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func graphsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/detective/graph_resource_gen.go b/internal/aws/detective/graph_resource_gen.go index c8f9b4965f..e8178db7ea 100644 --- a/internal/aws/detective/graph_resource_gen.go +++ b/internal/aws/detective/graph_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/detective/member_invitation_plural_data_source_gen.go b/internal/aws/detective/member_invitation_plural_data_source_gen.go index afa6cb3502..039872fd84 100644 --- a/internal/aws/detective/member_invitation_plural_data_source_gen.go +++ b/internal/aws/detective/member_invitation_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func memberInvitationsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/detective/member_invitation_resource_gen.go b/internal/aws/detective/member_invitation_resource_gen.go index 00f01e8c3e..588aaecf18 100644 --- a/internal/aws/detective/member_invitation_resource_gen.go +++ b/internal/aws/detective/member_invitation_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/devopsguru/notification_channel_plural_data_source_gen.go b/internal/aws/devopsguru/notification_channel_plural_data_source_gen.go index 47c7a3dfce..51c41893e0 100644 --- a/internal/aws/devopsguru/notification_channel_plural_data_source_gen.go +++ b/internal/aws/devopsguru/notification_channel_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func notificationChannelsDataSourceType(ctx context.Context) (tfsdk.DataSourceTy }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/devopsguru/notification_channel_resource_gen.go b/internal/aws/devopsguru/notification_channel_resource_gen.go index 84125f69b1..afc7cc6db7 100644 --- a/internal/aws/devopsguru/notification_channel_resource_gen.go +++ b/internal/aws/devopsguru/notification_channel_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/devopsguru/resource_collection_resource_gen.go b/internal/aws/devopsguru/resource_collection_resource_gen.go index f4b4c99db4..b0cd8a6d39 100644 --- a/internal/aws/devopsguru/resource_collection_resource_gen.go +++ b/internal/aws/devopsguru/resource_collection_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/dynamodb/global_table_plural_data_source_gen.go b/internal/aws/dynamodb/global_table_plural_data_source_gen.go index 06550c5606..991db187b4 100644 --- a/internal/aws/dynamodb/global_table_plural_data_source_gen.go +++ b/internal/aws/dynamodb/global_table_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func globalTablesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/dynamodb/global_table_resource_gen.go b/internal/aws/dynamodb/global_table_resource_gen.go index 48a9764e20..616d26c7b8 100644 --- a/internal/aws/dynamodb/global_table_resource_gen.go +++ b/internal/aws/dynamodb/global_table_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -57,7 +56,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "attribute_name": { // Property: AttributeName @@ -73,7 +72,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MinItems: 1, }, ), @@ -207,7 +206,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "index_name": { // Property: IndexName @@ -251,7 +250,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "non_key_attributes": { // Property: NonKeyAttributes - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "projection_type": { @@ -338,7 +337,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -463,7 +462,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "index_name": { // Property: IndexName @@ -506,7 +505,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "non_key_attributes": { // Property: NonKeyAttributes - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "projection_type": { @@ -519,7 +518,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, Computed: true, @@ -747,7 +746,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "contributor_insights_specification": { // Property: ContributorInsightsSpecification @@ -764,7 +763,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, "global_secondary_indexes": { // Property: GlobalSecondaryIndexes - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "contributor_insights_specification": { // Property: ContributorInsightsSpecification @@ -870,7 +869,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -989,7 +988,7 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, "tags": { // Property: Tags - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -1002,12 +1001,12 @@ func globalTableResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MinItems: 1, }, ), diff --git a/internal/aws/dynamodb/global_table_singular_data_source_gen.go b/internal/aws/dynamodb/global_table_singular_data_source_gen.go index d77a6492ed..e857e47cd2 100644 --- a/internal/aws/dynamodb/global_table_singular_data_source_gen.go +++ b/internal/aws/dynamodb/global_table_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -56,7 +55,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "attribute_name": { // Property: AttributeName @@ -69,7 +68,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -201,7 +200,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "index_name": { // Property: IndexName @@ -233,7 +232,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error map[string]tfsdk.Attribute{ "non_key_attributes": { // Property: NonKeyAttributes - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "projection_type": { @@ -305,7 +304,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -418,7 +417,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "index_name": { // Property: IndexName @@ -450,7 +449,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error map[string]tfsdk.Attribute{ "non_key_attributes": { // Property: NonKeyAttributes - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "projection_type": { @@ -463,7 +462,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -687,7 +686,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "contributor_insights_specification": { // Property: ContributorInsightsSpecification @@ -704,7 +703,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "global_secondary_indexes": { // Property: GlobalSecondaryIndexes - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "contributor_insights_specification": { // Property: ContributorInsightsSpecification @@ -789,7 +788,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -890,7 +889,7 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "tags": { // Property: Tags - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -903,12 +902,12 @@ func globalTableDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ec2/carrier_gateway_plural_data_source_gen.go b/internal/aws/ec2/carrier_gateway_plural_data_source_gen.go index 281ef50f2a..346fb2dcb1 100644 --- a/internal/aws/ec2/carrier_gateway_plural_data_source_gen.go +++ b/internal/aws/ec2/carrier_gateway_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func carrierGatewaysDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/carrier_gateway_resource_gen.go b/internal/aws/ec2/carrier_gateway_resource_gen.go index d40a9ed570..6c342b85a8 100644 --- a/internal/aws/ec2/carrier_gateway_resource_gen.go +++ b/internal/aws/ec2/carrier_gateway_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -80,7 +79,7 @@ func carrierGatewayResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -99,7 +98,7 @@ func carrierGatewayResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/ec2/carrier_gateway_singular_data_source_gen.go b/internal/aws/ec2/carrier_gateway_singular_data_source_gen.go index 7e883306f4..0dc9c9a435 100644 --- a/internal/aws/ec2/carrier_gateway_singular_data_source_gen.go +++ b/internal/aws/ec2/carrier_gateway_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -79,7 +78,7 @@ func carrierGatewayDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -92,7 +91,7 @@ func carrierGatewayDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ec2/dhcp_options_plural_data_source_gen.go b/internal/aws/ec2/dhcp_options_plural_data_source_gen.go index 968d86b76d..17bad9b871 100644 --- a/internal/aws/ec2/dhcp_options_plural_data_source_gen.go +++ b/internal/aws/ec2/dhcp_options_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func dHCPOptionsPluralDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/dhcp_options_resource_gen.go b/internal/aws/ec2/dhcp_options_resource_gen.go index 0d5ad22454..0284046512 100644 --- a/internal/aws/ec2/dhcp_options_resource_gen.go +++ b/internal/aws/ec2/dhcp_options_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ec2/ec2_fleet_plural_data_source_gen.go b/internal/aws/ec2/ec2_fleet_plural_data_source_gen.go index 5ce8fd82a8..e0289b3404 100644 --- a/internal/aws/ec2/ec2_fleet_plural_data_source_gen.go +++ b/internal/aws/ec2/ec2_fleet_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func eC2FleetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/ec2_fleet_resource_gen.go b/internal/aws/ec2/ec2_fleet_resource_gen.go index 34f15d7546..e02dbd41a6 100644 --- a/internal/aws/ec2/ec2_fleet_resource_gen.go +++ b/internal/aws/ec2/ec2_fleet_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ec2/egress_only_internet_gateway_plural_data_source_gen.go b/internal/aws/ec2/egress_only_internet_gateway_plural_data_source_gen.go index 0dac909a0b..3700cdbcc2 100644 --- a/internal/aws/ec2/egress_only_internet_gateway_plural_data_source_gen.go +++ b/internal/aws/ec2/egress_only_internet_gateway_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func egressOnlyInternetGatewaysDataSourceType(ctx context.Context) (tfsdk.DataSo }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/enclave_certificate_iam_role_association_resource_gen.go b/internal/aws/ec2/enclave_certificate_iam_role_association_resource_gen.go index 7bac60a585..de16c0f4f5 100644 --- a/internal/aws/ec2/enclave_certificate_iam_role_association_resource_gen.go +++ b/internal/aws/ec2/enclave_certificate_iam_role_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ec2/flow_log_plural_data_source_gen.go b/internal/aws/ec2/flow_log_plural_data_source_gen.go index 06c48ad384..56019d616e 100644 --- a/internal/aws/ec2/flow_log_plural_data_source_gen.go +++ b/internal/aws/ec2/flow_log_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func flowLogsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/flow_log_resource_gen.go b/internal/aws/ec2/flow_log_resource_gen.go index fd8d17ecf1..c591100402 100644 --- a/internal/aws/ec2/flow_log_resource_gen.go +++ b/internal/aws/ec2/flow_log_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ec2/local_gateway_route_plural_data_source_gen.go b/internal/aws/ec2/local_gateway_route_plural_data_source_gen.go index 98bdda32b6..bd85a394d6 100644 --- a/internal/aws/ec2/local_gateway_route_plural_data_source_gen.go +++ b/internal/aws/ec2/local_gateway_route_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func localGatewayRoutesDataSourceType(ctx context.Context) (tfsdk.DataSourceType }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/local_gateway_route_table_vpc_association_plural_data_source_gen.go b/internal/aws/ec2/local_gateway_route_table_vpc_association_plural_data_source_gen.go index 54f2f3eb7f..77e766a202 100644 --- a/internal/aws/ec2/local_gateway_route_table_vpc_association_plural_data_source_gen.go +++ b/internal/aws/ec2/local_gateway_route_table_vpc_association_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func localGatewayRouteTableVPCAssociationsDataSourceType(ctx context.Context) (t }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/local_gateway_route_table_vpc_association_resource_gen.go b/internal/aws/ec2/local_gateway_route_table_vpc_association_resource_gen.go index 5e466a3e07..cc48f2f335 100644 --- a/internal/aws/ec2/local_gateway_route_table_vpc_association_resource_gen.go +++ b/internal/aws/ec2/local_gateway_route_table_vpc_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -94,7 +93,7 @@ func localGatewayRouteTableVPCAssociationResourceType(ctx context.Context) (tfsd // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -113,7 +112,7 @@ func localGatewayRouteTableVPCAssociationResourceType(ctx context.Context) (tfsd }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/ec2/local_gateway_route_table_vpc_association_singular_data_source_gen.go b/internal/aws/ec2/local_gateway_route_table_vpc_association_singular_data_source_gen.go index 280c8ec74e..e6192ac418 100644 --- a/internal/aws/ec2/local_gateway_route_table_vpc_association_singular_data_source_gen.go +++ b/internal/aws/ec2/local_gateway_route_table_vpc_association_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -90,7 +89,7 @@ func localGatewayRouteTableVPCAssociationDataSourceType(ctx context.Context) (tf // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -103,7 +102,7 @@ func localGatewayRouteTableVPCAssociationDataSourceType(ctx context.Context) (tf Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ec2/network_insights_analysis_plural_data_source_gen.go b/internal/aws/ec2/network_insights_analysis_plural_data_source_gen.go index 1cadd87c72..ff841bdc8f 100644 --- a/internal/aws/ec2/network_insights_analysis_plural_data_source_gen.go +++ b/internal/aws/ec2/network_insights_analysis_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func networkInsightsAnalysesDataSourceType(ctx context.Context) (tfsdk.DataSourc }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/network_insights_path_plural_data_source_gen.go b/internal/aws/ec2/network_insights_path_plural_data_source_gen.go index 993d85cfed..ee2d8596ec 100644 --- a/internal/aws/ec2/network_insights_path_plural_data_source_gen.go +++ b/internal/aws/ec2/network_insights_path_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func networkInsightsPathsDataSourceType(ctx context.Context) (tfsdk.DataSourceTy }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/network_insights_path_resource_gen.go b/internal/aws/ec2/network_insights_path_resource_gen.go index 81aceafab0..1b24642585 100644 --- a/internal/aws/ec2/network_insights_path_resource_gen.go +++ b/internal/aws/ec2/network_insights_path_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ec2/prefix_list_plural_data_source_gen.go b/internal/aws/ec2/prefix_list_plural_data_source_gen.go index 3072f19d20..795c00f96d 100644 --- a/internal/aws/ec2/prefix_list_plural_data_source_gen.go +++ b/internal/aws/ec2/prefix_list_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func prefixListsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/prefix_list_resource_gen.go b/internal/aws/ec2/prefix_list_resource_gen.go index 06eb7cba11..0c83f28dc5 100644 --- a/internal/aws/ec2/prefix_list_resource_gen.go +++ b/internal/aws/ec2/prefix_list_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ec2/spot_fleet_plural_data_source_gen.go b/internal/aws/ec2/spot_fleet_plural_data_source_gen.go index e83104d19e..7a23193e88 100644 --- a/internal/aws/ec2/spot_fleet_plural_data_source_gen.go +++ b/internal/aws/ec2/spot_fleet_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func spotFleetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/spot_fleet_resource_gen.go b/internal/aws/ec2/spot_fleet_resource_gen.go index a28a8fa4ea..fdb189f458 100644 --- a/internal/aws/ec2/spot_fleet_resource_gen.go +++ b/internal/aws/ec2/spot_fleet_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ec2/transit_gateway_connect_plural_data_source_gen.go b/internal/aws/ec2/transit_gateway_connect_plural_data_source_gen.go index 196b11c795..a9dbb3bef4 100644 --- a/internal/aws/ec2/transit_gateway_connect_plural_data_source_gen.go +++ b/internal/aws/ec2/transit_gateway_connect_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func transitGatewayConnectsDataSourceType(ctx context.Context) (tfsdk.DataSource }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/transit_gateway_multicast_domain_plural_data_source_gen.go b/internal/aws/ec2/transit_gateway_multicast_domain_plural_data_source_gen.go index ac6a4e6031..8f9445c177 100644 --- a/internal/aws/ec2/transit_gateway_multicast_domain_plural_data_source_gen.go +++ b/internal/aws/ec2/transit_gateway_multicast_domain_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func transitGatewayMulticastDomainsDataSourceType(ctx context.Context) (tfsdk.Da }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/transit_gateway_peering_attachment_plural_data_source_gen.go b/internal/aws/ec2/transit_gateway_peering_attachment_plural_data_source_gen.go index 39b7929a4d..d583f7e3e4 100644 --- a/internal/aws/ec2/transit_gateway_peering_attachment_plural_data_source_gen.go +++ b/internal/aws/ec2/transit_gateway_peering_attachment_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func transitGatewayPeeringAttachmentsDataSourceType(ctx context.Context) (tfsdk. }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ec2/transit_gateway_plural_data_source_gen.go b/internal/aws/ec2/transit_gateway_plural_data_source_gen.go index 5f84f43627..d34c3b1875 100644 --- a/internal/aws/ec2/transit_gateway_plural_data_source_gen.go +++ b/internal/aws/ec2/transit_gateway_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func transitGatewaysDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecr/registry_policy_plural_data_source_gen.go b/internal/aws/ecr/registry_policy_plural_data_source_gen.go index f446b77e5b..864d20418d 100644 --- a/internal/aws/ecr/registry_policy_plural_data_source_gen.go +++ b/internal/aws/ecr/registry_policy_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func registryPoliciesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecr/replication_configuration_plural_data_source_gen.go b/internal/aws/ecr/replication_configuration_plural_data_source_gen.go index adc29e204f..856274f1e5 100644 --- a/internal/aws/ecr/replication_configuration_plural_data_source_gen.go +++ b/internal/aws/ecr/replication_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func replicationConfigurationsDataSourceType(ctx context.Context) (tfsdk.DataSou }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecr/repository_plural_data_source_gen.go b/internal/aws/ecr/repository_plural_data_source_gen.go index 869ce58ae0..72a336d4e3 100644 --- a/internal/aws/ecr/repository_plural_data_source_gen.go +++ b/internal/aws/ecr/repository_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func repositoriesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecr/repository_resource_gen.go b/internal/aws/ecr/repository_resource_gen.go index 7c50ec6bc3..386d7aecc2 100644 --- a/internal/aws/ecr/repository_resource_gen.go +++ b/internal/aws/ecr/repository_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -267,7 +266,7 @@ func repositoryResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -288,7 +287,7 @@ func repositoryResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/ecr/repository_singular_data_source_gen.go b/internal/aws/ecr/repository_singular_data_source_gen.go index 523bf1df75..31d57cfd19 100644 --- a/internal/aws/ecr/repository_singular_data_source_gen.go +++ b/internal/aws/ecr/repository_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -227,7 +226,7 @@ func repositoryDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -242,7 +241,7 @@ func repositoryDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ecs/capacity_provider_plural_data_source_gen.go b/internal/aws/ecs/capacity_provider_plural_data_source_gen.go index 16dbebb151..c803e5145e 100644 --- a/internal/aws/ecs/capacity_provider_plural_data_source_gen.go +++ b/internal/aws/ecs/capacity_provider_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func capacityProvidersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecs/capacity_provider_resource_gen.go b/internal/aws/ecs/capacity_provider_resource_gen.go index ec49714236..674d4e0f15 100644 --- a/internal/aws/ecs/capacity_provider_resource_gen.go +++ b/internal/aws/ecs/capacity_provider_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ecs/cluster_capacity_provider_associations_plural_data_source_gen.go b/internal/aws/ecs/cluster_capacity_provider_associations_plural_data_source_gen.go index e943401616..a4d8958950 100644 --- a/internal/aws/ecs/cluster_capacity_provider_associations_plural_data_source_gen.go +++ b/internal/aws/ecs/cluster_capacity_provider_associations_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func clusterCapacityProviderAssociationsPluralDataSourceType(ctx context.Context }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecs/cluster_capacity_provider_associations_resource_gen.go b/internal/aws/ecs/cluster_capacity_provider_associations_resource_gen.go index 1800318460..8ec8d504d6 100644 --- a/internal/aws/ecs/cluster_capacity_provider_associations_resource_gen.go +++ b/internal/aws/ecs/cluster_capacity_provider_associations_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ecs/cluster_plural_data_source_gen.go b/internal/aws/ecs/cluster_plural_data_source_gen.go index 8aa41e008b..4037eb2d52 100644 --- a/internal/aws/ecs/cluster_plural_data_source_gen.go +++ b/internal/aws/ecs/cluster_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func clustersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecs/service_plural_data_source_gen.go b/internal/aws/ecs/service_plural_data_source_gen.go index 04f084938c..305feb47ea 100644 --- a/internal/aws/ecs/service_plural_data_source_gen.go +++ b/internal/aws/ecs/service_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func servicesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecs/service_resource_gen.go b/internal/aws/ecs/service_resource_gen.go index 29166a83a0..0458bc359f 100644 --- a/internal/aws/ecs/service_resource_gen.go +++ b/internal/aws/ecs/service_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ecs/task_definition_plural_data_source_gen.go b/internal/aws/ecs/task_definition_plural_data_source_gen.go index 65d949aa55..2cc6d2039c 100644 --- a/internal/aws/ecs/task_definition_plural_data_source_gen.go +++ b/internal/aws/ecs/task_definition_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func taskDefinitionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ecs/task_definition_resource_gen.go b/internal/aws/ecs/task_definition_resource_gen.go index 74c0266efa..a0d74dfb1e 100644 --- a/internal/aws/ecs/task_definition_resource_gen.go +++ b/internal/aws/ecs/task_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ecs/task_set_resource_gen.go b/internal/aws/ecs/task_set_resource_gen.go index a47de16fb9..2511a88531 100644 --- a/internal/aws/ecs/task_set_resource_gen.go +++ b/internal/aws/ecs/task_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/efs/access_point_plural_data_source_gen.go b/internal/aws/efs/access_point_plural_data_source_gen.go index 06604434a4..18067df669 100644 --- a/internal/aws/efs/access_point_plural_data_source_gen.go +++ b/internal/aws/efs/access_point_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func accessPointsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/efs/access_point_resource_gen.go b/internal/aws/efs/access_point_resource_gen.go index b605cdbc1f..20cbea1400 100644 --- a/internal/aws/efs/access_point_resource_gen.go +++ b/internal/aws/efs/access_point_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -54,7 +53,7 @@ func accessPointResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -73,7 +72,7 @@ func accessPointResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/efs/access_point_singular_data_source_gen.go b/internal/aws/efs/access_point_singular_data_source_gen.go index a13031f554..b067199039 100644 --- a/internal/aws/efs/access_point_singular_data_source_gen.go +++ b/internal/aws/efs/access_point_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -53,7 +52,7 @@ func accessPointDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -66,7 +65,7 @@ func accessPointDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/efs/file_system_plural_data_source_gen.go b/internal/aws/efs/file_system_plural_data_source_gen.go index 04d0702488..7a77f94b83 100644 --- a/internal/aws/efs/file_system_plural_data_source_gen.go +++ b/internal/aws/efs/file_system_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func fileSystemsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/efs/file_system_resource_gen.go b/internal/aws/efs/file_system_resource_gen.go index 0218fd0b18..183a3cbe05 100644 --- a/internal/aws/efs/file_system_resource_gen.go +++ b/internal/aws/efs/file_system_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/eks/addon_resource_gen.go b/internal/aws/eks/addon_resource_gen.go index 5a7733eea0..cabe737428 100644 --- a/internal/aws/eks/addon_resource_gen.go +++ b/internal/aws/eks/addon_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -155,7 +154,7 @@ func addonResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -176,7 +175,7 @@ func addonResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/eks/addon_singular_data_source_gen.go b/internal/aws/eks/addon_singular_data_source_gen.go index e366de7288..8d4c0c4d74 100644 --- a/internal/aws/eks/addon_singular_data_source_gen.go +++ b/internal/aws/eks/addon_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -128,7 +127,7 @@ func addonDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -143,7 +142,7 @@ func addonDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/eks/fargate_profile_resource_gen.go b/internal/aws/eks/fargate_profile_resource_gen.go index 77e216d324..a49a06f342 100644 --- a/internal/aws/eks/fargate_profile_resource_gen.go +++ b/internal/aws/eks/fargate_profile_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/elasticache/global_replication_group_plural_data_source_gen.go b/internal/aws/elasticache/global_replication_group_plural_data_source_gen.go index f108e3f944..d64d2396ad 100644 --- a/internal/aws/elasticache/global_replication_group_plural_data_source_gen.go +++ b/internal/aws/elasticache/global_replication_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func globalReplicationGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourc }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/elasticache/global_replication_group_resource_gen.go b/internal/aws/elasticache/global_replication_group_resource_gen.go index 433d3c42fc..f27662c0fd 100644 --- a/internal/aws/elasticache/global_replication_group_resource_gen.go +++ b/internal/aws/elasticache/global_replication_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/elasticache/user_group_plural_data_source_gen.go b/internal/aws/elasticache/user_group_plural_data_source_gen.go index b89a1c0f75..bfe1e425bd 100644 --- a/internal/aws/elasticache/user_group_plural_data_source_gen.go +++ b/internal/aws/elasticache/user_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func userGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/elasticache/user_group_resource_gen.go b/internal/aws/elasticache/user_group_resource_gen.go index 86d0c0af43..868e3d0d19 100644 --- a/internal/aws/elasticache/user_group_resource_gen.go +++ b/internal/aws/elasticache/user_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/elasticache/user_plural_data_source_gen.go b/internal/aws/elasticache/user_plural_data_source_gen.go index 73a13acc3e..0604f514b1 100644 --- a/internal/aws/elasticache/user_plural_data_source_gen.go +++ b/internal/aws/elasticache/user_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func usersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/elasticache/user_resource_gen.go b/internal/aws/elasticache/user_resource_gen.go index 0422ff7560..c15cb4dcfb 100644 --- a/internal/aws/elasticache/user_resource_gen.go +++ b/internal/aws/elasticache/user_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/emr/studio_plural_data_source_gen.go b/internal/aws/emr/studio_plural_data_source_gen.go index 574a2165d1..0949fe4ee6 100644 --- a/internal/aws/emr/studio_plural_data_source_gen.go +++ b/internal/aws/emr/studio_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func studiosDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/emr/studio_resource_gen.go b/internal/aws/emr/studio_resource_gen.go index 9d099649f7..1bdd406391 100644 --- a/internal/aws/emr/studio_resource_gen.go +++ b/internal/aws/emr/studio_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -205,7 +204,7 @@ func studioResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -226,7 +225,7 @@ func studioResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/emr/studio_session_mapping_plural_data_source_gen.go b/internal/aws/emr/studio_session_mapping_plural_data_source_gen.go index 2bea3b7036..c43f50c19b 100644 --- a/internal/aws/emr/studio_session_mapping_plural_data_source_gen.go +++ b/internal/aws/emr/studio_session_mapping_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func studioSessionMappingsDataSourceType(ctx context.Context) (tfsdk.DataSourceT }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/emr/studio_session_mapping_resource_gen.go b/internal/aws/emr/studio_session_mapping_resource_gen.go index 30d1dd0945..1692cce161 100644 --- a/internal/aws/emr/studio_session_mapping_resource_gen.go +++ b/internal/aws/emr/studio_session_mapping_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/emr/studio_singular_data_source_gen.go b/internal/aws/emr/studio_singular_data_source_gen.go index e3be653bf7..8f18d5afe6 100644 --- a/internal/aws/emr/studio_singular_data_source_gen.go +++ b/internal/aws/emr/studio_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -174,7 +173,7 @@ func studioDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -189,7 +188,7 @@ func studioDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/emrcontainers/virtual_cluster_plural_data_source_gen.go b/internal/aws/emrcontainers/virtual_cluster_plural_data_source_gen.go index f789fbaf8a..efc186a113 100644 --- a/internal/aws/emrcontainers/virtual_cluster_plural_data_source_gen.go +++ b/internal/aws/emrcontainers/virtual_cluster_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func virtualClustersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/emrcontainers/virtual_cluster_resource_gen.go b/internal/aws/emrcontainers/virtual_cluster_resource_gen.go index 0003876d40..8ef0c59d87 100644 --- a/internal/aws/emrcontainers/virtual_cluster_resource_gen.go +++ b/internal/aws/emrcontainers/virtual_cluster_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -189,7 +188,7 @@ func virtualClusterResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this virtual cluster.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -204,7 +203,7 @@ func virtualClusterResourceType(ctx context.Context) (tfsdk.ResourceType, error) Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/emrcontainers/virtual_cluster_singular_data_source_gen.go b/internal/aws/emrcontainers/virtual_cluster_singular_data_source_gen.go index 0f324b4ec9..dbfacf3598 100644 --- a/internal/aws/emrcontainers/virtual_cluster_singular_data_source_gen.go +++ b/internal/aws/emrcontainers/virtual_cluster_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -173,7 +172,7 @@ func virtualClusterDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this virtual cluster.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -188,7 +187,7 @@ func virtualClusterDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/events/api_destination_plural_data_source_gen.go b/internal/aws/events/api_destination_plural_data_source_gen.go index 01bf6c3837..2c4f218612 100644 --- a/internal/aws/events/api_destination_plural_data_source_gen.go +++ b/internal/aws/events/api_destination_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func apiDestinationsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/events/api_destination_resource_gen.go b/internal/aws/events/api_destination_resource_gen.go index c4dbba123e..9d06b94fac 100644 --- a/internal/aws/events/api_destination_resource_gen.go +++ b/internal/aws/events/api_destination_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/events/archive_plural_data_source_gen.go b/internal/aws/events/archive_plural_data_source_gen.go index 26c9fc5409..019bd6b42e 100644 --- a/internal/aws/events/archive_plural_data_source_gen.go +++ b/internal/aws/events/archive_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func archivesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/events/connection_plural_data_source_gen.go b/internal/aws/events/connection_plural_data_source_gen.go index 0378e166ed..5d5a2d88f3 100644 --- a/internal/aws/events/connection_plural_data_source_gen.go +++ b/internal/aws/events/connection_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func connectionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/finspace/environment_plural_data_source_gen.go b/internal/aws/finspace/environment_plural_data_source_gen.go index 61e5e1c04e..134f5c389c 100644 --- a/internal/aws/finspace/environment_plural_data_source_gen.go +++ b/internal/aws/finspace/environment_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func environmentsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/finspace/environment_resource_gen.go b/internal/aws/finspace/environment_resource_gen.go index 02059b4ba5..3025bd045d 100644 --- a/internal/aws/finspace/environment_resource_gen.go +++ b/internal/aws/finspace/environment_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/fis/experiment_template_plural_data_source_gen.go b/internal/aws/fis/experiment_template_plural_data_source_gen.go index 0c22982a18..9448dadd99 100644 --- a/internal/aws/fis/experiment_template_plural_data_source_gen.go +++ b/internal/aws/fis/experiment_template_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func experimentTemplatesDataSourceType(ctx context.Context) (tfsdk.DataSourceTyp }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/fis/experiment_template_resource_gen.go b/internal/aws/fis/experiment_template_resource_gen.go index 0d8776915d..b6d8aaded0 100644 --- a/internal/aws/fis/experiment_template_resource_gen.go +++ b/internal/aws/fis/experiment_template_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/fms/notification_channel_resource_gen.go b/internal/aws/fms/notification_channel_resource_gen.go index d612790f12..4e7887a911 100644 --- a/internal/aws/fms/notification_channel_resource_gen.go +++ b/internal/aws/fms/notification_channel_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/fms/policy_resource_gen.go b/internal/aws/fms/policy_resource_gen.go index 6b89d69d75..d681253661 100644 --- a/internal/aws/fms/policy_resource_gen.go +++ b/internal/aws/fms/policy_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/frauddetector/detector_plural_data_source_gen.go b/internal/aws/frauddetector/detector_plural_data_source_gen.go index cccce06b3b..a26020569c 100644 --- a/internal/aws/frauddetector/detector_plural_data_source_gen.go +++ b/internal/aws/frauddetector/detector_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func detectorsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/frauddetector/detector_resource_gen.go b/internal/aws/frauddetector/detector_resource_gen.go index f957951451..ac041028bd 100644 --- a/internal/aws/frauddetector/detector_resource_gen.go +++ b/internal/aws/frauddetector/detector_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/frauddetector/entity_type_plural_data_source_gen.go b/internal/aws/frauddetector/entity_type_plural_data_source_gen.go index 4082c375ad..21d8adf954 100644 --- a/internal/aws/frauddetector/entity_type_plural_data_source_gen.go +++ b/internal/aws/frauddetector/entity_type_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func entityTypesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/frauddetector/entity_type_resource_gen.go b/internal/aws/frauddetector/entity_type_resource_gen.go index 02edb52d06..4a6a3e5508 100644 --- a/internal/aws/frauddetector/entity_type_resource_gen.go +++ b/internal/aws/frauddetector/entity_type_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/frauddetector/event_type_plural_data_source_gen.go b/internal/aws/frauddetector/event_type_plural_data_source_gen.go index 91944cce0c..56c11f528d 100644 --- a/internal/aws/frauddetector/event_type_plural_data_source_gen.go +++ b/internal/aws/frauddetector/event_type_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func eventTypesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/frauddetector/event_type_resource_gen.go b/internal/aws/frauddetector/event_type_resource_gen.go index cb159829ca..3885111aac 100644 --- a/internal/aws/frauddetector/event_type_resource_gen.go +++ b/internal/aws/frauddetector/event_type_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/frauddetector/label_plural_data_source_gen.go b/internal/aws/frauddetector/label_plural_data_source_gen.go index 839a296ceb..abe4ac7a66 100644 --- a/internal/aws/frauddetector/label_plural_data_source_gen.go +++ b/internal/aws/frauddetector/label_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func labelsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/frauddetector/label_resource_gen.go b/internal/aws/frauddetector/label_resource_gen.go index 5670ab46bc..cd648a578a 100644 --- a/internal/aws/frauddetector/label_resource_gen.go +++ b/internal/aws/frauddetector/label_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/frauddetector/outcome_plural_data_source_gen.go b/internal/aws/frauddetector/outcome_plural_data_source_gen.go index ad20acce32..3501d91923 100644 --- a/internal/aws/frauddetector/outcome_plural_data_source_gen.go +++ b/internal/aws/frauddetector/outcome_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func outcomesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/frauddetector/outcome_resource_gen.go b/internal/aws/frauddetector/outcome_resource_gen.go index db0f4d07e0..033c2ab2b8 100644 --- a/internal/aws/frauddetector/outcome_resource_gen.go +++ b/internal/aws/frauddetector/outcome_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/frauddetector/variable_plural_data_source_gen.go b/internal/aws/frauddetector/variable_plural_data_source_gen.go index 7e3460b71c..0d0072ea22 100644 --- a/internal/aws/frauddetector/variable_plural_data_source_gen.go +++ b/internal/aws/frauddetector/variable_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func variablesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/frauddetector/variable_resource_gen.go b/internal/aws/frauddetector/variable_resource_gen.go index 3ebfb4ff5a..b21677e2ce 100644 --- a/internal/aws/frauddetector/variable_resource_gen.go +++ b/internal/aws/frauddetector/variable_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/gamelift/alias_plural_data_source_gen.go b/internal/aws/gamelift/alias_plural_data_source_gen.go index 3bd99f6006..c7545f2d4d 100644 --- a/internal/aws/gamelift/alias_plural_data_source_gen.go +++ b/internal/aws/gamelift/alias_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func aliasesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/gamelift/alias_resource_gen.go b/internal/aws/gamelift/alias_resource_gen.go index 5024c4666d..0959e74e46 100644 --- a/internal/aws/gamelift/alias_resource_gen.go +++ b/internal/aws/gamelift/alias_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/gamelift/fleet_plural_data_source_gen.go b/internal/aws/gamelift/fleet_plural_data_source_gen.go index cb0ea6a475..1d0a240063 100644 --- a/internal/aws/gamelift/fleet_plural_data_source_gen.go +++ b/internal/aws/gamelift/fleet_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func fleetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/gamelift/fleet_resource_gen.go b/internal/aws/gamelift/fleet_resource_gen.go index c781a42fa0..a94914c48e 100644 --- a/internal/aws/gamelift/fleet_resource_gen.go +++ b/internal/aws/gamelift/fleet_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/gamelift/game_server_group_resource_gen.go b/internal/aws/gamelift/game_server_group_resource_gen.go index 6e35b5a353..32c30c8e32 100644 --- a/internal/aws/gamelift/game_server_group_resource_gen.go +++ b/internal/aws/gamelift/game_server_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/globalaccelerator/accelerator_resource_gen.go b/internal/aws/globalaccelerator/accelerator_resource_gen.go index b527b46406..ef180376d9 100644 --- a/internal/aws/globalaccelerator/accelerator_resource_gen.go +++ b/internal/aws/globalaccelerator/accelerator_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/globalaccelerator/endpoint_group_resource_gen.go b/internal/aws/globalaccelerator/endpoint_group_resource_gen.go index 973d988206..3a7268ec46 100644 --- a/internal/aws/globalaccelerator/endpoint_group_resource_gen.go +++ b/internal/aws/globalaccelerator/endpoint_group_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/globalaccelerator/listener_resource_gen.go b/internal/aws/globalaccelerator/listener_resource_gen.go index 6a87997a3e..2bad612289 100644 --- a/internal/aws/globalaccelerator/listener_resource_gen.go +++ b/internal/aws/globalaccelerator/listener_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/glue/registry_plural_data_source_gen.go b/internal/aws/glue/registry_plural_data_source_gen.go index dfd3b4cbdf..a4e29981c6 100644 --- a/internal/aws/glue/registry_plural_data_source_gen.go +++ b/internal/aws/glue/registry_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func registriesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/glue/registry_resource_gen.go b/internal/aws/glue/registry_resource_gen.go index cf06c0945f..7a9a467837 100644 --- a/internal/aws/glue/registry_resource_gen.go +++ b/internal/aws/glue/registry_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/glue/schema_plural_data_source_gen.go b/internal/aws/glue/schema_plural_data_source_gen.go index b4bf97adcb..dd446c9bf1 100644 --- a/internal/aws/glue/schema_plural_data_source_gen.go +++ b/internal/aws/glue/schema_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func schemasDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/glue/schema_resource_gen.go b/internal/aws/glue/schema_resource_gen.go index 6f4bf395fd..09bda91d75 100644 --- a/internal/aws/glue/schema_resource_gen.go +++ b/internal/aws/glue/schema_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/glue/schema_version_metadata_resource_gen.go b/internal/aws/glue/schema_version_metadata_resource_gen.go index 1b7ba2af74..0a7171ec65 100644 --- a/internal/aws/glue/schema_version_metadata_resource_gen.go +++ b/internal/aws/glue/schema_version_metadata_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/glue/schema_version_resource_gen.go b/internal/aws/glue/schema_version_resource_gen.go index 024ef0d843..0b81530a5d 100644 --- a/internal/aws/glue/schema_version_resource_gen.go +++ b/internal/aws/glue/schema_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/greengrassv2/component_version_plural_data_source_gen.go b/internal/aws/greengrassv2/component_version_plural_data_source_gen.go index 29e59026a7..4cf503a14f 100644 --- a/internal/aws/greengrassv2/component_version_plural_data_source_gen.go +++ b/internal/aws/greengrassv2/component_version_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func componentVersionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/greengrassv2/component_version_resource_gen.go b/internal/aws/greengrassv2/component_version_resource_gen.go index e953ab9d15..1585bde801 100644 --- a/internal/aws/greengrassv2/component_version_resource_gen.go +++ b/internal/aws/greengrassv2/component_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/groundstation/config_plural_data_source_gen.go b/internal/aws/groundstation/config_plural_data_source_gen.go index fb386f4502..b76744a586 100644 --- a/internal/aws/groundstation/config_plural_data_source_gen.go +++ b/internal/aws/groundstation/config_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func configsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/groundstation/dataflow_endpoint_group_plural_data_source_gen.go b/internal/aws/groundstation/dataflow_endpoint_group_plural_data_source_gen.go index 11e9bffd7d..d8167261a4 100644 --- a/internal/aws/groundstation/dataflow_endpoint_group_plural_data_source_gen.go +++ b/internal/aws/groundstation/dataflow_endpoint_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func dataflowEndpointGroupsDataSourceType(ctx context.Context) (tfsdk.DataSource }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/groundstation/mission_profile_plural_data_source_gen.go b/internal/aws/groundstation/mission_profile_plural_data_source_gen.go index c8b3570d5c..0fef6e568a 100644 --- a/internal/aws/groundstation/mission_profile_plural_data_source_gen.go +++ b/internal/aws/groundstation/mission_profile_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func missionProfilesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iam/oidc_provider_plural_data_source_gen.go b/internal/aws/iam/oidc_provider_plural_data_source_gen.go index d1f4fd252c..479e416a89 100644 --- a/internal/aws/iam/oidc_provider_plural_data_source_gen.go +++ b/internal/aws/iam/oidc_provider_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func oIDCProvidersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iam/oidc_provider_resource_gen.go b/internal/aws/iam/oidc_provider_resource_gen.go index cf69a71de7..da762d1132 100644 --- a/internal/aws/iam/oidc_provider_resource_gen.go +++ b/internal/aws/iam/oidc_provider_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iam/saml_provider_plural_data_source_gen.go b/internal/aws/iam/saml_provider_plural_data_source_gen.go index be82aeaafa..329ad9c295 100644 --- a/internal/aws/iam/saml_provider_plural_data_source_gen.go +++ b/internal/aws/iam/saml_provider_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func sAMLProvidersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iam/saml_provider_resource_gen.go b/internal/aws/iam/saml_provider_resource_gen.go index 89bf3e096e..6b6d681896 100644 --- a/internal/aws/iam/saml_provider_resource_gen.go +++ b/internal/aws/iam/saml_provider_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iam/server_certificate_plural_data_source_gen.go b/internal/aws/iam/server_certificate_plural_data_source_gen.go index 669416ad7d..a9ca7778c0 100644 --- a/internal/aws/iam/server_certificate_plural_data_source_gen.go +++ b/internal/aws/iam/server_certificate_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func serverCertificatesDataSourceType(ctx context.Context) (tfsdk.DataSourceType }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iam/server_certificate_resource_gen.go b/internal/aws/iam/server_certificate_resource_gen.go index 2393efd650..e9006064c5 100644 --- a/internal/aws/iam/server_certificate_resource_gen.go +++ b/internal/aws/iam/server_certificate_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iam/virtual_mfa_device_plural_data_source_gen.go b/internal/aws/iam/virtual_mfa_device_plural_data_source_gen.go index 34c8f547e6..ee203222ef 100644 --- a/internal/aws/iam/virtual_mfa_device_plural_data_source_gen.go +++ b/internal/aws/iam/virtual_mfa_device_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func virtualMFADevicesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iam/virtual_mfa_device_resource_gen.go b/internal/aws/iam/virtual_mfa_device_resource_gen.go index 8be9075afd..90c970730b 100644 --- a/internal/aws/iam/virtual_mfa_device_resource_gen.go +++ b/internal/aws/iam/virtual_mfa_device_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/imagebuilder/component_resource_gen.go b/internal/aws/imagebuilder/component_resource_gen.go index a634867305..d13a9f7d25 100644 --- a/internal/aws/imagebuilder/component_resource_gen.go +++ b/internal/aws/imagebuilder/component_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/imagebuilder/container_recipe_plural_data_source_gen.go b/internal/aws/imagebuilder/container_recipe_plural_data_source_gen.go index 1bb5920cec..02d6d937af 100644 --- a/internal/aws/imagebuilder/container_recipe_plural_data_source_gen.go +++ b/internal/aws/imagebuilder/container_recipe_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func containerRecipesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/imagebuilder/container_recipe_resource_gen.go b/internal/aws/imagebuilder/container_recipe_resource_gen.go index f992c3061e..49eb7491ac 100644 --- a/internal/aws/imagebuilder/container_recipe_resource_gen.go +++ b/internal/aws/imagebuilder/container_recipe_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/imagebuilder/distribution_configuration_plural_data_source_gen.go b/internal/aws/imagebuilder/distribution_configuration_plural_data_source_gen.go index 9a49045565..7617146530 100644 --- a/internal/aws/imagebuilder/distribution_configuration_plural_data_source_gen.go +++ b/internal/aws/imagebuilder/distribution_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func distributionConfigurationsDataSourceType(ctx context.Context) (tfsdk.DataSo }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/imagebuilder/distribution_configuration_resource_gen.go b/internal/aws/imagebuilder/distribution_configuration_resource_gen.go index d27a997068..1b8b1b5ed1 100644 --- a/internal/aws/imagebuilder/distribution_configuration_resource_gen.go +++ b/internal/aws/imagebuilder/distribution_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/imagebuilder/image_pipeline_plural_data_source_gen.go b/internal/aws/imagebuilder/image_pipeline_plural_data_source_gen.go index d02c58ea3b..109cef39a0 100644 --- a/internal/aws/imagebuilder/image_pipeline_plural_data_source_gen.go +++ b/internal/aws/imagebuilder/image_pipeline_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func imagePipelinesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/imagebuilder/image_pipeline_resource_gen.go b/internal/aws/imagebuilder/image_pipeline_resource_gen.go index c338d861bd..cee76a4de0 100644 --- a/internal/aws/imagebuilder/image_pipeline_resource_gen.go +++ b/internal/aws/imagebuilder/image_pipeline_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/imagebuilder/image_plural_data_source_gen.go b/internal/aws/imagebuilder/image_plural_data_source_gen.go index 25bd478c85..f4060a72ba 100644 --- a/internal/aws/imagebuilder/image_plural_data_source_gen.go +++ b/internal/aws/imagebuilder/image_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func imagesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/imagebuilder/image_recipe_plural_data_source_gen.go b/internal/aws/imagebuilder/image_recipe_plural_data_source_gen.go index dc47891968..0571407c88 100644 --- a/internal/aws/imagebuilder/image_recipe_plural_data_source_gen.go +++ b/internal/aws/imagebuilder/image_recipe_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func imageRecipesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/imagebuilder/image_recipe_resource_gen.go b/internal/aws/imagebuilder/image_recipe_resource_gen.go index 2aaac62fe9..2abf69b326 100644 --- a/internal/aws/imagebuilder/image_recipe_resource_gen.go +++ b/internal/aws/imagebuilder/image_recipe_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/imagebuilder/image_resource_gen.go b/internal/aws/imagebuilder/image_resource_gen.go index 9655eccfdb..24ebe4eee7 100644 --- a/internal/aws/imagebuilder/image_resource_gen.go +++ b/internal/aws/imagebuilder/image_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/imagebuilder/infrastructure_configuration_plural_data_source_gen.go b/internal/aws/imagebuilder/infrastructure_configuration_plural_data_source_gen.go index 1ec7edccf0..ffb3f59643 100644 --- a/internal/aws/imagebuilder/infrastructure_configuration_plural_data_source_gen.go +++ b/internal/aws/imagebuilder/infrastructure_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func infrastructureConfigurationsDataSourceType(ctx context.Context) (tfsdk.Data }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/account_audit_configuration_plural_data_source_gen.go b/internal/aws/iot/account_audit_configuration_plural_data_source_gen.go index 41a5fb9195..6f67bc4575 100644 --- a/internal/aws/iot/account_audit_configuration_plural_data_source_gen.go +++ b/internal/aws/iot/account_audit_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func accountAuditConfigurationsDataSourceType(ctx context.Context) (tfsdk.DataSo }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/account_audit_configuration_resource_gen.go b/internal/aws/iot/account_audit_configuration_resource_gen.go index 614abfa3b0..416eb129cc 100644 --- a/internal/aws/iot/account_audit_configuration_resource_gen.go +++ b/internal/aws/iot/account_audit_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iot/authorizer_plural_data_source_gen.go b/internal/aws/iot/authorizer_plural_data_source_gen.go index 590caf3957..d72eecb520 100644 --- a/internal/aws/iot/authorizer_plural_data_source_gen.go +++ b/internal/aws/iot/authorizer_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func authorizersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/authorizer_resource_gen.go b/internal/aws/iot/authorizer_resource_gen.go index eb546a7719..432d957876 100644 --- a/internal/aws/iot/authorizer_resource_gen.go +++ b/internal/aws/iot/authorizer_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iot/certificate_plural_data_source_gen.go b/internal/aws/iot/certificate_plural_data_source_gen.go index e756334b5f..f34e8bbea2 100644 --- a/internal/aws/iot/certificate_plural_data_source_gen.go +++ b/internal/aws/iot/certificate_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func certificatesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/certificate_resource_gen.go b/internal/aws/iot/certificate_resource_gen.go index fa507732e1..815f3f7b33 100644 --- a/internal/aws/iot/certificate_resource_gen.go +++ b/internal/aws/iot/certificate_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iot/custom_metric_plural_data_source_gen.go b/internal/aws/iot/custom_metric_plural_data_source_gen.go index 4a8bc6a20d..f47e617ba5 100644 --- a/internal/aws/iot/custom_metric_plural_data_source_gen.go +++ b/internal/aws/iot/custom_metric_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func customMetricsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/custom_metric_resource_gen.go b/internal/aws/iot/custom_metric_resource_gen.go index a7bfcd3952..36c5d6ca10 100644 --- a/internal/aws/iot/custom_metric_resource_gen.go +++ b/internal/aws/iot/custom_metric_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -132,7 +131,7 @@ func customMetricResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -153,7 +152,7 @@ func customMetricResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iot/custom_metric_singular_data_source_gen.go b/internal/aws/iot/custom_metric_singular_data_source_gen.go index ef66ee88c2..536916678b 100644 --- a/internal/aws/iot/custom_metric_singular_data_source_gen.go +++ b/internal/aws/iot/custom_metric_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -110,7 +109,7 @@ func customMetricDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -125,7 +124,7 @@ func customMetricDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iot/dimension_plural_data_source_gen.go b/internal/aws/iot/dimension_plural_data_source_gen.go index d294cfbacb..b7bdec7623 100644 --- a/internal/aws/iot/dimension_plural_data_source_gen.go +++ b/internal/aws/iot/dimension_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func dimensionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/dimension_resource_gen.go b/internal/aws/iot/dimension_resource_gen.go index a9278e2d7a..351e27a87a 100644 --- a/internal/aws/iot/dimension_resource_gen.go +++ b/internal/aws/iot/dimension_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -70,7 +69,7 @@ func dimensionResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "Specifies the value or list of values for the dimension.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, "tags": { @@ -107,7 +106,7 @@ func dimensionResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "Metadata that can be used to manage the dimension.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -128,7 +127,7 @@ func dimensionResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iot/dimension_singular_data_source_gen.go b/internal/aws/iot/dimension_singular_data_source_gen.go index 6189e42a5a..7872f51409 100644 --- a/internal/aws/iot/dimension_singular_data_source_gen.go +++ b/internal/aws/iot/dimension_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -62,7 +61,7 @@ func dimensionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "Specifies the value or list of values for the dimension.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "tags": { @@ -99,7 +98,7 @@ func dimensionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "Metadata that can be used to manage the dimension.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -114,7 +113,7 @@ func dimensionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iot/domain_configuration_plural_data_source_gen.go b/internal/aws/iot/domain_configuration_plural_data_source_gen.go index f1e3cd8b9e..541f960afc 100644 --- a/internal/aws/iot/domain_configuration_plural_data_source_gen.go +++ b/internal/aws/iot/domain_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func domainConfigurationsDataSourceType(ctx context.Context) (tfsdk.DataSourceTy }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/domain_configuration_resource_gen.go b/internal/aws/iot/domain_configuration_resource_gen.go index 67babd829c..db3dc60a14 100644 --- a/internal/aws/iot/domain_configuration_resource_gen.go +++ b/internal/aws/iot/domain_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iot/mitigation_action_plural_data_source_gen.go b/internal/aws/iot/mitigation_action_plural_data_source_gen.go index 6a4c949d48..325ad18489 100644 --- a/internal/aws/iot/mitigation_action_plural_data_source_gen.go +++ b/internal/aws/iot/mitigation_action_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func mitigationActionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/mitigation_action_resource_gen.go b/internal/aws/iot/mitigation_action_resource_gen.go index 2cad4f8a20..7a4f50cc5c 100644 --- a/internal/aws/iot/mitigation_action_resource_gen.go +++ b/internal/aws/iot/mitigation_action_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -187,7 +186,7 @@ func mitigationActionResourceType(ctx context.Context) (tfsdk.ResourceType, erro "thing_group_names": { // Property: ThingGroupNames Description: "The list of groups to which you want to add the things that triggered the mitigation action.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, }, @@ -366,7 +365,7 @@ func mitigationActionResourceType(ctx context.Context) (tfsdk.ResourceType, erro // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -387,7 +386,7 @@ func mitigationActionResourceType(ctx context.Context) (tfsdk.ResourceType, erro }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iot/mitigation_action_singular_data_source_gen.go b/internal/aws/iot/mitigation_action_singular_data_source_gen.go index 334c071a1c..7f75f68599 100644 --- a/internal/aws/iot/mitigation_action_singular_data_source_gen.go +++ b/internal/aws/iot/mitigation_action_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -179,7 +178,7 @@ func mitigationActionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, "thing_group_names": { // Property: ThingGroupNames Description: "The list of groups to which you want to add the things that triggered the mitigation action.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -329,7 +328,7 @@ func mitigationActionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -344,7 +343,7 @@ func mitigationActionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iot/provisioning_template_plural_data_source_gen.go b/internal/aws/iot/provisioning_template_plural_data_source_gen.go index 7a80f0e86b..a641495b21 100644 --- a/internal/aws/iot/provisioning_template_plural_data_source_gen.go +++ b/internal/aws/iot/provisioning_template_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func provisioningTemplatesDataSourceType(ctx context.Context) (tfsdk.DataSourceT }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/provisioning_template_resource_gen.go b/internal/aws/iot/provisioning_template_resource_gen.go index 041c7445fa..97aed12531 100644 --- a/internal/aws/iot/provisioning_template_resource_gen.go +++ b/internal/aws/iot/provisioning_template_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iot/scheduled_audit_plural_data_source_gen.go b/internal/aws/iot/scheduled_audit_plural_data_source_gen.go index 786d7f7926..5b596f73c3 100644 --- a/internal/aws/iot/scheduled_audit_plural_data_source_gen.go +++ b/internal/aws/iot/scheduled_audit_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func scheduledAuditsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/scheduled_audit_resource_gen.go b/internal/aws/iot/scheduled_audit_resource_gen.go index c25ca2befd..e9187145c2 100644 --- a/internal/aws/iot/scheduled_audit_resource_gen.go +++ b/internal/aws/iot/scheduled_audit_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -157,7 +156,7 @@ func scheduledAuditResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -178,7 +177,7 @@ func scheduledAuditResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), @@ -197,7 +196,7 @@ func scheduledAuditResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "uniqueItems": true // } Description: "Which checks are performed during the scheduled audit. Checks must be enabled for your account.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, } diff --git a/internal/aws/iot/scheduled_audit_singular_data_source_gen.go b/internal/aws/iot/scheduled_audit_singular_data_source_gen.go index d6e8e22297..98a2884a4a 100644 --- a/internal/aws/iot/scheduled_audit_singular_data_source_gen.go +++ b/internal/aws/iot/scheduled_audit_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -130,7 +129,7 @@ func scheduledAuditDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -145,7 +144,7 @@ func scheduledAuditDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -162,7 +161,7 @@ func scheduledAuditDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "uniqueItems": true // } Description: "Which checks are performed during the scheduled audit. Checks must be enabled for your account.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/security_profile_plural_data_source_gen.go b/internal/aws/iot/security_profile_plural_data_source_gen.go index 6d1fd1043a..53b2f1d247 100644 --- a/internal/aws/iot/security_profile_plural_data_source_gen.go +++ b/internal/aws/iot/security_profile_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func securityProfilesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/security_profile_resource_gen.go b/internal/aws/iot/security_profile_resource_gen.go index 0fadb075e8..718106b3d3 100644 --- a/internal/aws/iot/security_profile_resource_gen.go +++ b/internal/aws/iot/security_profile_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -73,7 +72,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error // "uniqueItems": true // } Description: "A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "metric": { // Property: Metric @@ -115,7 +114,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -376,7 +375,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error // "uniqueItems": true // } Description: "Specifies the behaviors that, when violated by a device (thing), cause an alert.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "criteria": { // Property: Criteria @@ -488,7 +487,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error "cidrs": { // Property: Cidrs Description: "If the ComparisonOperator calls for a set of CIDRs, use this to specify that set to be compared with the metric.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "count": { @@ -506,19 +505,19 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error "numbers": { // Property: Numbers Description: "The numeral values of a metric.", - Type: providertypes.SetType{ElemType: types.NumberType}, + Type: types.SetType{ElemType: types.NumberType}, Optional: true, }, "ports": { // Property: Ports Description: "If the ComparisonOperator calls for a set of ports, use this to specify that set to be compared with the metric.", - Type: providertypes.SetType{ElemType: types.NumberType}, + Type: types.SetType{ElemType: types.NumberType}, Optional: true, }, "strings": { // Property: Strings Description: "The string values of a metric.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, @@ -584,7 +583,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -669,7 +668,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error // "uniqueItems": true // } Description: "Metadata that can be used to manage the security profile.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -690,7 +689,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), @@ -711,7 +710,7 @@ func securityProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error // "uniqueItems": true // } Description: "A set of target ARNs that the security profile is attached to.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, } diff --git a/internal/aws/iot/security_profile_singular_data_source_gen.go b/internal/aws/iot/security_profile_singular_data_source_gen.go index 3d2f4eebce..549c9d9034 100644 --- a/internal/aws/iot/security_profile_singular_data_source_gen.go +++ b/internal/aws/iot/security_profile_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -72,7 +71,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e // "uniqueItems": true // } Description: "A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "metric": { // Property: Metric @@ -102,7 +101,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -357,7 +356,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e // "uniqueItems": true // } Description: "Specifies the behaviors that, when violated by a device (thing), cause an alert.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "criteria": { // Property: Criteria @@ -426,7 +425,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e "cidrs": { // Property: Cidrs Description: "If the ComparisonOperator calls for a set of CIDRs, use this to specify that set to be compared with the metric.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "count": { @@ -444,19 +443,19 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e "numbers": { // Property: Numbers Description: "The numeral values of a metric.", - Type: providertypes.SetType{ElemType: types.NumberType}, + Type: types.SetType{ElemType: types.NumberType}, Computed: true, }, "ports": { // Property: Ports Description: "If the ComparisonOperator calls for a set of ports, use this to specify that set to be compared with the metric.", - Type: providertypes.SetType{ElemType: types.NumberType}, + Type: types.SetType{ElemType: types.NumberType}, Computed: true, }, "strings": { // Property: Strings Description: "The string values of a metric.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -507,7 +506,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -582,7 +581,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e // "uniqueItems": true // } Description: "Metadata that can be used to manage the security profile.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -597,7 +596,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -616,7 +615,7 @@ func securityProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e // "uniqueItems": true // } Description: "A set of target ARNs that the security profile is attached to.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/topic_rule_destination_plural_data_source_gen.go b/internal/aws/iot/topic_rule_destination_plural_data_source_gen.go index 02a4b9ad6a..b1ecd9c8c0 100644 --- a/internal/aws/iot/topic_rule_destination_plural_data_source_gen.go +++ b/internal/aws/iot/topic_rule_destination_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func topicRuleDestinationsDataSourceType(ctx context.Context) (tfsdk.DataSourceT }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/topic_rule_destination_resource_gen.go b/internal/aws/iot/topic_rule_destination_resource_gen.go index 71201aac85..ac05c1f964 100644 --- a/internal/aws/iot/topic_rule_destination_resource_gen.go +++ b/internal/aws/iot/topic_rule_destination_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iot/topic_rule_plural_data_source_gen.go b/internal/aws/iot/topic_rule_plural_data_source_gen.go index c03fe8c0cf..1ac1dde223 100644 --- a/internal/aws/iot/topic_rule_plural_data_source_gen.go +++ b/internal/aws/iot/topic_rule_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func topicRulesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iot/topic_rule_resource_gen.go b/internal/aws/iot/topic_rule_resource_gen.go index c55352d361..5e29eb2295 100644 --- a/internal/aws/iot/topic_rule_resource_gen.go +++ b/internal/aws/iot/topic_rule_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iotcoredeviceadvisor/suite_definition_resource_gen.go b/internal/aws/iotcoredeviceadvisor/suite_definition_resource_gen.go index ecafef08ae..bd189d7b67 100644 --- a/internal/aws/iotcoredeviceadvisor/suite_definition_resource_gen.go +++ b/internal/aws/iotcoredeviceadvisor/suite_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -218,7 +217,7 @@ func suiteDefinitionResourceType(ctx context.Context) (tfsdk.ResourceType, error // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -239,7 +238,7 @@ func suiteDefinitionResourceType(ctx context.Context) (tfsdk.ResourceType, error }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/iotcoredeviceadvisor/suite_definition_singular_data_source_gen.go b/internal/aws/iotcoredeviceadvisor/suite_definition_singular_data_source_gen.go index 3646ce3127..4fd719048e 100644 --- a/internal/aws/iotcoredeviceadvisor/suite_definition_singular_data_source_gen.go +++ b/internal/aws/iotcoredeviceadvisor/suite_definition_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -199,7 +198,7 @@ func suiteDefinitionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -214,7 +213,7 @@ func suiteDefinitionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iotevents/detector_model_plural_data_source_gen.go b/internal/aws/iotevents/detector_model_plural_data_source_gen.go index 791397945a..3c1c855069 100644 --- a/internal/aws/iotevents/detector_model_plural_data_source_gen.go +++ b/internal/aws/iotevents/detector_model_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func detectorModelsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotevents/detector_model_resource_gen.go b/internal/aws/iotevents/detector_model_resource_gen.go index 65bd2d7caa..bc63aad8a7 100644 --- a/internal/aws/iotevents/detector_model_resource_gen.go +++ b/internal/aws/iotevents/detector_model_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iotevents/input_plural_data_source_gen.go b/internal/aws/iotevents/input_plural_data_source_gen.go index f4693e5b47..826289dff9 100644 --- a/internal/aws/iotevents/input_plural_data_source_gen.go +++ b/internal/aws/iotevents/input_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func inputsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotevents/input_resource_gen.go b/internal/aws/iotevents/input_resource_gen.go index 340abbbdcf..48db21b95e 100644 --- a/internal/aws/iotevents/input_resource_gen.go +++ b/internal/aws/iotevents/input_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iotfleethub/application_plural_data_source_gen.go b/internal/aws/iotfleethub/application_plural_data_source_gen.go index 1d44daa793..e14b6e86d6 100644 --- a/internal/aws/iotfleethub/application_plural_data_source_gen.go +++ b/internal/aws/iotfleethub/application_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func applicationsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotfleethub/application_resource_gen.go b/internal/aws/iotfleethub/application_resource_gen.go index bc4fb7c8a4..bea8e316ce 100644 --- a/internal/aws/iotfleethub/application_resource_gen.go +++ b/internal/aws/iotfleethub/application_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -201,7 +200,7 @@ func applicationResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the application.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -222,7 +221,7 @@ func applicationResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MinItems: 0, MaxItems: 50, }, diff --git a/internal/aws/iotfleethub/application_singular_data_source_gen.go b/internal/aws/iotfleethub/application_singular_data_source_gen.go index ba42a62668..fc4c94aeaa 100644 --- a/internal/aws/iotfleethub/application_singular_data_source_gen.go +++ b/internal/aws/iotfleethub/application_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -191,7 +190,7 @@ func applicationDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the application.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -206,7 +205,7 @@ func applicationDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iotsitewise/asset_model_plural_data_source_gen.go b/internal/aws/iotsitewise/asset_model_plural_data_source_gen.go index 74a1689cfc..9ab30e1e7b 100644 --- a/internal/aws/iotsitewise/asset_model_plural_data_source_gen.go +++ b/internal/aws/iotsitewise/asset_model_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func assetModelsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotsitewise/asset_model_resource_gen.go b/internal/aws/iotsitewise/asset_model_resource_gen.go index 8e786be76f..c4c3a7406f 100644 --- a/internal/aws/iotsitewise/asset_model_resource_gen.go +++ b/internal/aws/iotsitewise/asset_model_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iotsitewise/asset_plural_data_source_gen.go b/internal/aws/iotsitewise/asset_plural_data_source_gen.go index ea2678eea5..9af9c745da 100644 --- a/internal/aws/iotsitewise/asset_plural_data_source_gen.go +++ b/internal/aws/iotsitewise/asset_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func assetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotsitewise/asset_resource_gen.go b/internal/aws/iotsitewise/asset_resource_gen.go index 3cb5dbc214..a7a8ad9fc5 100644 --- a/internal/aws/iotsitewise/asset_resource_gen.go +++ b/internal/aws/iotsitewise/asset_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iotsitewise/gateway_plural_data_source_gen.go b/internal/aws/iotsitewise/gateway_plural_data_source_gen.go index 59715ca833..644f49f7dd 100644 --- a/internal/aws/iotsitewise/gateway_plural_data_source_gen.go +++ b/internal/aws/iotsitewise/gateway_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func gatewaysDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotsitewise/gateway_resource_gen.go b/internal/aws/iotsitewise/gateway_resource_gen.go index efcc751491..6514d81be0 100644 --- a/internal/aws/iotsitewise/gateway_resource_gen.go +++ b/internal/aws/iotsitewise/gateway_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/iotsitewise/portal_plural_data_source_gen.go b/internal/aws/iotsitewise/portal_plural_data_source_gen.go index e0d3605464..8745ff62aa 100644 --- a/internal/aws/iotsitewise/portal_plural_data_source_gen.go +++ b/internal/aws/iotsitewise/portal_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func portalsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotwireless/destination_plural_data_source_gen.go b/internal/aws/iotwireless/destination_plural_data_source_gen.go index 64660a3b64..02b326ba33 100644 --- a/internal/aws/iotwireless/destination_plural_data_source_gen.go +++ b/internal/aws/iotwireless/destination_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func destinationsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotwireless/destination_resource_gen.go b/internal/aws/iotwireless/destination_resource_gen.go index 472771eefb..e66ad9c5fd 100644 --- a/internal/aws/iotwireless/destination_resource_gen.go +++ b/internal/aws/iotwireless/destination_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -141,7 +140,7 @@ func destinationResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the destination.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -160,7 +159,7 @@ func destinationResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iotwireless/destination_singular_data_source_gen.go b/internal/aws/iotwireless/destination_singular_data_source_gen.go index 2f33ec7bfc..58bceba877 100644 --- a/internal/aws/iotwireless/destination_singular_data_source_gen.go +++ b/internal/aws/iotwireless/destination_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -122,7 +121,7 @@ func destinationDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the destination.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -135,7 +134,7 @@ func destinationDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iotwireless/device_profile_plural_data_source_gen.go b/internal/aws/iotwireless/device_profile_plural_data_source_gen.go index a5a02db7dc..2e39f03a27 100644 --- a/internal/aws/iotwireless/device_profile_plural_data_source_gen.go +++ b/internal/aws/iotwireless/device_profile_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func deviceProfilesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotwireless/device_profile_resource_gen.go b/internal/aws/iotwireless/device_profile_resource_gen.go index a1a179d777..bbd75c03f3 100644 --- a/internal/aws/iotwireless/device_profile_resource_gen.go +++ b/internal/aws/iotwireless/device_profile_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -260,7 +259,7 @@ func deviceProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the device profile.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -279,7 +278,7 @@ func deviceProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iotwireless/device_profile_singular_data_source_gen.go b/internal/aws/iotwireless/device_profile_singular_data_source_gen.go index 3afac18584..fa9f04bb72 100644 --- a/internal/aws/iotwireless/device_profile_singular_data_source_gen.go +++ b/internal/aws/iotwireless/device_profile_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -226,7 +225,7 @@ func deviceProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the device profile.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -239,7 +238,7 @@ func deviceProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iotwireless/service_profile_plural_data_source_gen.go b/internal/aws/iotwireless/service_profile_plural_data_source_gen.go index 7acef1df79..edbd8022c8 100644 --- a/internal/aws/iotwireless/service_profile_plural_data_source_gen.go +++ b/internal/aws/iotwireless/service_profile_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func serviceProfilesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotwireless/service_profile_resource_gen.go b/internal/aws/iotwireless/service_profile_resource_gen.go index 527bb8c817..c4a723601b 100644 --- a/internal/aws/iotwireless/service_profile_resource_gen.go +++ b/internal/aws/iotwireless/service_profile_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -253,7 +252,7 @@ func serviceProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the service profile.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -272,7 +271,7 @@ func serviceProfileResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iotwireless/service_profile_singular_data_source_gen.go b/internal/aws/iotwireless/service_profile_singular_data_source_gen.go index 0f48f8b424..279ef8f16a 100644 --- a/internal/aws/iotwireless/service_profile_singular_data_source_gen.go +++ b/internal/aws/iotwireless/service_profile_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -249,7 +248,7 @@ func serviceProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the service profile.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -262,7 +261,7 @@ func serviceProfileDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iotwireless/task_definition_resource_gen.go b/internal/aws/iotwireless/task_definition_resource_gen.go index 8266b22f4b..6d9121d147 100644 --- a/internal/aws/iotwireless/task_definition_resource_gen.go +++ b/internal/aws/iotwireless/task_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -219,7 +218,7 @@ func taskDefinitionResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the destination.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -238,7 +237,7 @@ func taskDefinitionResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iotwireless/task_definition_singular_data_source_gen.go b/internal/aws/iotwireless/task_definition_singular_data_source_gen.go index 3e4e1e8576..ea0cd81501 100644 --- a/internal/aws/iotwireless/task_definition_singular_data_source_gen.go +++ b/internal/aws/iotwireless/task_definition_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -197,7 +196,7 @@ func taskDefinitionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the destination.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -210,7 +209,7 @@ func taskDefinitionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iotwireless/wireless_device_plural_data_source_gen.go b/internal/aws/iotwireless/wireless_device_plural_data_source_gen.go index 19d7b6e9b3..5dc14c4fa2 100644 --- a/internal/aws/iotwireless/wireless_device_plural_data_source_gen.go +++ b/internal/aws/iotwireless/wireless_device_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func wirelessDevicesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotwireless/wireless_device_resource_gen.go b/internal/aws/iotwireless/wireless_device_resource_gen.go index 4106be9f85..150f86db51 100644 --- a/internal/aws/iotwireless/wireless_device_resource_gen.go +++ b/internal/aws/iotwireless/wireless_device_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -444,7 +443,7 @@ func wirelessDeviceResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the device. Currently not supported, will not create if tags are passed.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -463,7 +462,7 @@ func wirelessDeviceResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iotwireless/wireless_device_singular_data_source_gen.go b/internal/aws/iotwireless/wireless_device_singular_data_source_gen.go index b4437a4018..9d382e5db8 100644 --- a/internal/aws/iotwireless/wireless_device_singular_data_source_gen.go +++ b/internal/aws/iotwireless/wireless_device_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -410,7 +409,7 @@ func wirelessDeviceDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the device. Currently not supported, will not create if tags are passed.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -423,7 +422,7 @@ func wirelessDeviceDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/iotwireless/wireless_gateway_plural_data_source_gen.go b/internal/aws/iotwireless/wireless_gateway_plural_data_source_gen.go index 81bad7d9f8..43156c1045 100644 --- a/internal/aws/iotwireless/wireless_gateway_plural_data_source_gen.go +++ b/internal/aws/iotwireless/wireless_gateway_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func wirelessGatewaysDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/iotwireless/wireless_gateway_resource_gen.go b/internal/aws/iotwireless/wireless_gateway_resource_gen.go index 55c958d8a9..e404061edd 100644 --- a/internal/aws/iotwireless/wireless_gateway_resource_gen.go +++ b/internal/aws/iotwireless/wireless_gateway_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -153,7 +152,7 @@ func wirelessGatewayResourceType(ctx context.Context) (tfsdk.ResourceType, error // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the gateway.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -172,7 +171,7 @@ func wirelessGatewayResourceType(ctx context.Context) (tfsdk.ResourceType, error }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/iotwireless/wireless_gateway_singular_data_source_gen.go b/internal/aws/iotwireless/wireless_gateway_singular_data_source_gen.go index 33c039892b..0c95134f63 100644 --- a/internal/aws/iotwireless/wireless_gateway_singular_data_source_gen.go +++ b/internal/aws/iotwireless/wireless_gateway_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -143,7 +142,7 @@ func wirelessGatewayDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the gateway.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -156,7 +155,7 @@ func wirelessGatewayDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ivs/channel_plural_data_source_gen.go b/internal/aws/ivs/channel_plural_data_source_gen.go index a9582ef566..10d01cdb60 100644 --- a/internal/aws/ivs/channel_plural_data_source_gen.go +++ b/internal/aws/ivs/channel_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func channelsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ivs/channel_resource_gen.go b/internal/aws/ivs/channel_resource_gen.go index ba8ce0bcb8..ed593b2685 100644 --- a/internal/aws/ivs/channel_resource_gen.go +++ b/internal/aws/ivs/channel_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -159,7 +158,7 @@ func channelResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -178,7 +177,7 @@ func channelResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/ivs/channel_singular_data_source_gen.go b/internal/aws/ivs/channel_singular_data_source_gen.go index d76ea285e6..0ba1dcb07b 100644 --- a/internal/aws/ivs/channel_singular_data_source_gen.go +++ b/internal/aws/ivs/channel_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -142,7 +141,7 @@ func channelDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -155,7 +154,7 @@ func channelDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ivs/playback_key_pair_plural_data_source_gen.go b/internal/aws/ivs/playback_key_pair_plural_data_source_gen.go index b254195c53..adcf7a8f04 100644 --- a/internal/aws/ivs/playback_key_pair_plural_data_source_gen.go +++ b/internal/aws/ivs/playback_key_pair_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func playbackKeyPairsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ivs/playback_key_pair_resource_gen.go b/internal/aws/ivs/playback_key_pair_resource_gen.go index 4e0501c708..3987b1aac3 100644 --- a/internal/aws/ivs/playback_key_pair_resource_gen.go +++ b/internal/aws/ivs/playback_key_pair_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -112,7 +111,7 @@ func playbackKeyPairResourceType(ctx context.Context) (tfsdk.ResourceType, error // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -131,7 +130,7 @@ func playbackKeyPairResourceType(ctx context.Context) (tfsdk.ResourceType, error }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/ivs/playback_key_pair_singular_data_source_gen.go b/internal/aws/ivs/playback_key_pair_singular_data_source_gen.go index 0f1b7a4d98..b227d2c7ed 100644 --- a/internal/aws/ivs/playback_key_pair_singular_data_source_gen.go +++ b/internal/aws/ivs/playback_key_pair_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -101,7 +100,7 @@ func playbackKeyPairDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -114,7 +113,7 @@ func playbackKeyPairDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ivs/recording_configuration_plural_data_source_gen.go b/internal/aws/ivs/recording_configuration_plural_data_source_gen.go index da036fc601..9742dd6efa 100644 --- a/internal/aws/ivs/recording_configuration_plural_data_source_gen.go +++ b/internal/aws/ivs/recording_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func recordingConfigurationsDataSourceType(ctx context.Context) (tfsdk.DataSourc }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ivs/recording_configuration_resource_gen.go b/internal/aws/ivs/recording_configuration_resource_gen.go index f1a4fe817e..4819c15cb8 100644 --- a/internal/aws/ivs/recording_configuration_resource_gen.go +++ b/internal/aws/ivs/recording_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -165,7 +164,7 @@ func recordingConfigurationResourceType(ctx context.Context) (tfsdk.ResourceType // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -184,7 +183,7 @@ func recordingConfigurationResourceType(ctx context.Context) (tfsdk.ResourceType }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/ivs/recording_configuration_singular_data_source_gen.go b/internal/aws/ivs/recording_configuration_singular_data_source_gen.go index cde3137e77..a422e22bda 100644 --- a/internal/aws/ivs/recording_configuration_singular_data_source_gen.go +++ b/internal/aws/ivs/recording_configuration_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -145,7 +144,7 @@ func recordingConfigurationDataSourceType(ctx context.Context) (tfsdk.DataSource // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -158,7 +157,7 @@ func recordingConfigurationDataSourceType(ctx context.Context) (tfsdk.DataSource Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ivs/stream_key_resource_gen.go b/internal/aws/ivs/stream_key_resource_gen.go index 6337d6379f..dede757017 100644 --- a/internal/aws/ivs/stream_key_resource_gen.go +++ b/internal/aws/ivs/stream_key_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -81,7 +80,7 @@ func streamKeyResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -100,7 +99,7 @@ func streamKeyResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/ivs/stream_key_singular_data_source_gen.go b/internal/aws/ivs/stream_key_singular_data_source_gen.go index e590e4ceb8..6e3eddce76 100644 --- a/internal/aws/ivs/stream_key_singular_data_source_gen.go +++ b/internal/aws/ivs/stream_key_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -77,7 +76,7 @@ func streamKeyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "A list of key-value pairs that contain metadata for the asset model.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -90,7 +89,7 @@ func streamKeyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/kendra/data_source_resource_gen.go b/internal/aws/kendra/data_source_resource_gen.go index 06f95857a6..7638820ef2 100644 --- a/internal/aws/kendra/data_source_resource_gen.go +++ b/internal/aws/kendra/data_source_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/kendra/faq_resource_gen.go b/internal/aws/kendra/faq_resource_gen.go index 5e0b4bfd03..5155d1b67e 100644 --- a/internal/aws/kendra/faq_resource_gen.go +++ b/internal/aws/kendra/faq_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/kendra/index_plural_data_source_gen.go b/internal/aws/kendra/index_plural_data_source_gen.go index 8b653b48da..92b6cd33c6 100644 --- a/internal/aws/kendra/index_plural_data_source_gen.go +++ b/internal/aws/kendra/index_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func indicesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/kendra/index_resource_gen.go b/internal/aws/kendra/index_resource_gen.go index 363375ff8c..aad48112a5 100644 --- a/internal/aws/kendra/index_resource_gen.go +++ b/internal/aws/kendra/index_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/kinesis/stream_plural_data_source_gen.go b/internal/aws/kinesis/stream_plural_data_source_gen.go index df4631d438..3f0b1c49c8 100644 --- a/internal/aws/kinesis/stream_plural_data_source_gen.go +++ b/internal/aws/kinesis/stream_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func streamsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/kinesis/stream_resource_gen.go b/internal/aws/kinesis/stream_resource_gen.go index 6abdd44387..bb074b000d 100644 --- a/internal/aws/kinesis/stream_resource_gen.go +++ b/internal/aws/kinesis/stream_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/kinesisfirehose/delivery_stream_plural_data_source_gen.go b/internal/aws/kinesisfirehose/delivery_stream_plural_data_source_gen.go index a912bdcb8d..a0d4c4ef75 100644 --- a/internal/aws/kinesisfirehose/delivery_stream_plural_data_source_gen.go +++ b/internal/aws/kinesisfirehose/delivery_stream_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func deliveryStreamsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/kinesisfirehose/delivery_stream_resource_gen.go b/internal/aws/kinesisfirehose/delivery_stream_resource_gen.go index 86782b90c3..c860aba1b6 100644 --- a/internal/aws/kinesisfirehose/delivery_stream_resource_gen.go +++ b/internal/aws/kinesisfirehose/delivery_stream_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/kms/alias_plural_data_source_gen.go b/internal/aws/kms/alias_plural_data_source_gen.go index 194f014583..6fccbb25ca 100644 --- a/internal/aws/kms/alias_plural_data_source_gen.go +++ b/internal/aws/kms/alias_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func aliasesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/kms/alias_resource_gen.go b/internal/aws/kms/alias_resource_gen.go index 3820328017..8264e64097 100644 --- a/internal/aws/kms/alias_resource_gen.go +++ b/internal/aws/kms/alias_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/kms/key_resource_gen.go b/internal/aws/kms/key_resource_gen.go index a165d7b76f..ddcac95067 100644 --- a/internal/aws/kms/key_resource_gen.go +++ b/internal/aws/kms/key_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -218,7 +217,7 @@ func keyResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -239,7 +238,7 @@ func keyResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/kms/key_singular_data_source_gen.go b/internal/aws/kms/key_singular_data_source_gen.go index 4726d4606b..2e6c226daa 100644 --- a/internal/aws/kms/key_singular_data_source_gen.go +++ b/internal/aws/kms/key_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -180,7 +179,7 @@ func keyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -195,7 +194,7 @@ func keyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/kms/replica_key_resource_gen.go b/internal/aws/kms/replica_key_resource_gen.go index 6747849db2..d11b926543 100644 --- a/internal/aws/kms/replica_key_resource_gen.go +++ b/internal/aws/kms/replica_key_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -146,7 +145,7 @@ func replicaKeyResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -167,7 +166,7 @@ func replicaKeyResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/kms/replica_key_singular_data_source_gen.go b/internal/aws/kms/replica_key_singular_data_source_gen.go index bcb4e8af80..40fa85aab8 100644 --- a/internal/aws/kms/replica_key_singular_data_source_gen.go +++ b/internal/aws/kms/replica_key_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -132,7 +131,7 @@ func replicaKeyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -147,7 +146,7 @@ func replicaKeyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/lambda/code_signing_config_plural_data_source_gen.go b/internal/aws/lambda/code_signing_config_plural_data_source_gen.go index 2b04b99be5..aacbf4b42a 100644 --- a/internal/aws/lambda/code_signing_config_plural_data_source_gen.go +++ b/internal/aws/lambda/code_signing_config_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func codeSigningConfigsDataSourceType(ctx context.Context) (tfsdk.DataSourceType }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/lambda/code_signing_config_resource_gen.go b/internal/aws/lambda/code_signing_config_resource_gen.go index 35a8a76179..aa7e6c9052 100644 --- a/internal/aws/lambda/code_signing_config_resource_gen.go +++ b/internal/aws/lambda/code_signing_config_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/lambda/event_source_mapping_resource_gen.go b/internal/aws/lambda/event_source_mapping_resource_gen.go index fe3d076e87..ec9aa91555 100644 --- a/internal/aws/lambda/event_source_mapping_resource_gen.go +++ b/internal/aws/lambda/event_source_mapping_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/lambda/function_plural_data_source_gen.go b/internal/aws/lambda/function_plural_data_source_gen.go index e4a5f306d2..5ae66513f8 100644 --- a/internal/aws/lambda/function_plural_data_source_gen.go +++ b/internal/aws/lambda/function_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func functionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/lambda/function_resource_gen.go b/internal/aws/lambda/function_resource_gen.go index 27dc7dd5e0..4f99831e2c 100644 --- a/internal/aws/lambda/function_resource_gen.go +++ b/internal/aws/lambda/function_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -487,7 +486,7 @@ func functionResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A list of tags to apply to the function.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -508,7 +507,7 @@ func functionResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/lambda/function_singular_data_source_gen.go b/internal/aws/lambda/function_singular_data_source_gen.go index 83bb840071..e5ea75c8b2 100644 --- a/internal/aws/lambda/function_singular_data_source_gen.go +++ b/internal/aws/lambda/function_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -438,7 +437,7 @@ func functionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "A list of tags to apply to the function.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -453,7 +452,7 @@ func functionDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/licensemanager/grant_plural_data_source_gen.go b/internal/aws/licensemanager/grant_plural_data_source_gen.go index 19e402dbd7..9ec40b59c7 100644 --- a/internal/aws/licensemanager/grant_plural_data_source_gen.go +++ b/internal/aws/licensemanager/grant_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func grantsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/licensemanager/grant_resource_gen.go b/internal/aws/licensemanager/grant_resource_gen.go index 1fc0d28131..a667ec3216 100644 --- a/internal/aws/licensemanager/grant_resource_gen.go +++ b/internal/aws/licensemanager/grant_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/licensemanager/license_plural_data_source_gen.go b/internal/aws/licensemanager/license_plural_data_source_gen.go index df2ee2909c..8f890da0b1 100644 --- a/internal/aws/licensemanager/license_plural_data_source_gen.go +++ b/internal/aws/licensemanager/license_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func licensesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/licensemanager/license_resource_gen.go b/internal/aws/licensemanager/license_resource_gen.go index 0a622700f8..b9f7ad7b76 100644 --- a/internal/aws/licensemanager/license_resource_gen.go +++ b/internal/aws/licensemanager/license_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/location/geofence_collection_plural_data_source_gen.go b/internal/aws/location/geofence_collection_plural_data_source_gen.go index 1715d8c988..4176d4caa9 100644 --- a/internal/aws/location/geofence_collection_plural_data_source_gen.go +++ b/internal/aws/location/geofence_collection_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func geofenceCollectionsDataSourceType(ctx context.Context) (tfsdk.DataSourceTyp }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/location/geofence_collection_resource_gen.go b/internal/aws/location/geofence_collection_resource_gen.go index e3c728708a..e89ec657cb 100644 --- a/internal/aws/location/geofence_collection_resource_gen.go +++ b/internal/aws/location/geofence_collection_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/location/map_plural_data_source_gen.go b/internal/aws/location/map_plural_data_source_gen.go index 7b3266a020..119949ef20 100644 --- a/internal/aws/location/map_plural_data_source_gen.go +++ b/internal/aws/location/map_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func mapsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/location/map_resource_gen.go b/internal/aws/location/map_resource_gen.go index e1c5e882ed..7e66b53636 100644 --- a/internal/aws/location/map_resource_gen.go +++ b/internal/aws/location/map_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/location/place_index_plural_data_source_gen.go b/internal/aws/location/place_index_plural_data_source_gen.go index bd03448dba..dc53646045 100644 --- a/internal/aws/location/place_index_plural_data_source_gen.go +++ b/internal/aws/location/place_index_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func placeIndicesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/location/place_index_resource_gen.go b/internal/aws/location/place_index_resource_gen.go index bc5299dd4b..ecfbd135e1 100644 --- a/internal/aws/location/place_index_resource_gen.go +++ b/internal/aws/location/place_index_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/location/route_calculator_plural_data_source_gen.go b/internal/aws/location/route_calculator_plural_data_source_gen.go index 0f2ea986f5..aca0c49e7a 100644 --- a/internal/aws/location/route_calculator_plural_data_source_gen.go +++ b/internal/aws/location/route_calculator_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func routeCalculatorsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/location/route_calculator_resource_gen.go b/internal/aws/location/route_calculator_resource_gen.go index 79e718d68d..3113c38d2b 100644 --- a/internal/aws/location/route_calculator_resource_gen.go +++ b/internal/aws/location/route_calculator_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/location/tracker_consumer_resource_gen.go b/internal/aws/location/tracker_consumer_resource_gen.go index 7f5e555660..5b76ae3ab9 100644 --- a/internal/aws/location/tracker_consumer_resource_gen.go +++ b/internal/aws/location/tracker_consumer_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/location/tracker_plural_data_source_gen.go b/internal/aws/location/tracker_plural_data_source_gen.go index bf35c01691..703b7b70da 100644 --- a/internal/aws/location/tracker_plural_data_source_gen.go +++ b/internal/aws/location/tracker_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func trackersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/location/tracker_resource_gen.go b/internal/aws/location/tracker_resource_gen.go index b7c6cb3af1..81d0b54849 100644 --- a/internal/aws/location/tracker_resource_gen.go +++ b/internal/aws/location/tracker_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/logs/log_group_plural_data_source_gen.go b/internal/aws/logs/log_group_plural_data_source_gen.go index 202d8f8eae..d12fbb7bcf 100644 --- a/internal/aws/logs/log_group_plural_data_source_gen.go +++ b/internal/aws/logs/log_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func logGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/logs/log_group_resource_gen.go b/internal/aws/logs/log_group_resource_gen.go index 853761831a..6350b31f1a 100644 --- a/internal/aws/logs/log_group_resource_gen.go +++ b/internal/aws/logs/log_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/logs/query_definition_plural_data_source_gen.go b/internal/aws/logs/query_definition_plural_data_source_gen.go index 8fd2960cf0..1376c775c5 100644 --- a/internal/aws/logs/query_definition_plural_data_source_gen.go +++ b/internal/aws/logs/query_definition_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func queryDefinitionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/logs/query_definition_resource_gen.go b/internal/aws/logs/query_definition_resource_gen.go index 5cbd4cc2cc..327ab05586 100644 --- a/internal/aws/logs/query_definition_resource_gen.go +++ b/internal/aws/logs/query_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/logs/resource_policy_plural_data_source_gen.go b/internal/aws/logs/resource_policy_plural_data_source_gen.go index 19e4097a0c..d392492ba7 100644 --- a/internal/aws/logs/resource_policy_plural_data_source_gen.go +++ b/internal/aws/logs/resource_policy_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func resourcePoliciesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/logs/resource_policy_resource_gen.go b/internal/aws/logs/resource_policy_resource_gen.go index 9b16e17c9f..77793e26ab 100644 --- a/internal/aws/logs/resource_policy_resource_gen.go +++ b/internal/aws/logs/resource_policy_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/lookoutmetrics/alert_plural_data_source_gen.go b/internal/aws/lookoutmetrics/alert_plural_data_source_gen.go index 632d90b6b6..8cf1a2dffc 100644 --- a/internal/aws/lookoutmetrics/alert_plural_data_source_gen.go +++ b/internal/aws/lookoutmetrics/alert_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func alertsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/lookoutmetrics/alert_resource_gen.go b/internal/aws/lookoutmetrics/alert_resource_gen.go index aa2c000409..fcd15bd22d 100644 --- a/internal/aws/lookoutmetrics/alert_resource_gen.go +++ b/internal/aws/lookoutmetrics/alert_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/lookoutmetrics/anomaly_detector_plural_data_source_gen.go b/internal/aws/lookoutmetrics/anomaly_detector_plural_data_source_gen.go index fe75962f06..43fafc97f9 100644 --- a/internal/aws/lookoutmetrics/anomaly_detector_plural_data_source_gen.go +++ b/internal/aws/lookoutmetrics/anomaly_detector_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func anomalyDetectorsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/lookoutmetrics/anomaly_detector_resource_gen.go b/internal/aws/lookoutmetrics/anomaly_detector_resource_gen.go index 7ba319e33a..1b9c169989 100644 --- a/internal/aws/lookoutmetrics/anomaly_detector_resource_gen.go +++ b/internal/aws/lookoutmetrics/anomaly_detector_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/lookoutvision/project_plural_data_source_gen.go b/internal/aws/lookoutvision/project_plural_data_source_gen.go index 07bef43ba3..388687d4c5 100644 --- a/internal/aws/lookoutvision/project_plural_data_source_gen.go +++ b/internal/aws/lookoutvision/project_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func projectsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/lookoutvision/project_resource_gen.go b/internal/aws/lookoutvision/project_resource_gen.go index f6ae59f3a6..b1a9f51640 100644 --- a/internal/aws/lookoutvision/project_resource_gen.go +++ b/internal/aws/lookoutvision/project_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/macie/findings_filter_resource_gen.go b/internal/aws/macie/findings_filter_resource_gen.go index cb527a9109..590d68b2cc 100644 --- a/internal/aws/macie/findings_filter_resource_gen.go +++ b/internal/aws/macie/findings_filter_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/macie/session_resource_gen.go b/internal/aws/macie/session_resource_gen.go index dd427b948f..307ee25b59 100644 --- a/internal/aws/macie/session_resource_gen.go +++ b/internal/aws/macie/session_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediaconnect/flow_entitlement_resource_gen.go b/internal/aws/mediaconnect/flow_entitlement_resource_gen.go index bd5e2e3b08..a990963e2e 100644 --- a/internal/aws/mediaconnect/flow_entitlement_resource_gen.go +++ b/internal/aws/mediaconnect/flow_entitlement_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediaconnect/flow_output_resource_gen.go b/internal/aws/mediaconnect/flow_output_resource_gen.go index d0b5a28825..0f6b1bb5ad 100644 --- a/internal/aws/mediaconnect/flow_output_resource_gen.go +++ b/internal/aws/mediaconnect/flow_output_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediaconnect/flow_plural_data_source_gen.go b/internal/aws/mediaconnect/flow_plural_data_source_gen.go index e5341d8003..b8424c79ee 100644 --- a/internal/aws/mediaconnect/flow_plural_data_source_gen.go +++ b/internal/aws/mediaconnect/flow_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func flowsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/mediaconnect/flow_resource_gen.go b/internal/aws/mediaconnect/flow_resource_gen.go index 32bbd5364f..2c140cfd34 100644 --- a/internal/aws/mediaconnect/flow_resource_gen.go +++ b/internal/aws/mediaconnect/flow_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediaconnect/flow_source_resource_gen.go b/internal/aws/mediaconnect/flow_source_resource_gen.go index 3dc93a1b3f..c9b726ae5e 100644 --- a/internal/aws/mediaconnect/flow_source_resource_gen.go +++ b/internal/aws/mediaconnect/flow_source_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediapackage/asset_resource_gen.go b/internal/aws/mediapackage/asset_resource_gen.go index 787321b6e0..9996dc1346 100644 --- a/internal/aws/mediapackage/asset_resource_gen.go +++ b/internal/aws/mediapackage/asset_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediapackage/channel_plural_data_source_gen.go b/internal/aws/mediapackage/channel_plural_data_source_gen.go index 70f0da3523..0b40cc3fdc 100644 --- a/internal/aws/mediapackage/channel_plural_data_source_gen.go +++ b/internal/aws/mediapackage/channel_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func channelsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/mediapackage/channel_resource_gen.go b/internal/aws/mediapackage/channel_resource_gen.go index df7f884827..cec2ce300a 100644 --- a/internal/aws/mediapackage/channel_resource_gen.go +++ b/internal/aws/mediapackage/channel_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediapackage/origin_endpoint_plural_data_source_gen.go b/internal/aws/mediapackage/origin_endpoint_plural_data_source_gen.go index c29136b232..5d5545b04a 100644 --- a/internal/aws/mediapackage/origin_endpoint_plural_data_source_gen.go +++ b/internal/aws/mediapackage/origin_endpoint_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func originEndpointsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/mediapackage/origin_endpoint_resource_gen.go b/internal/aws/mediapackage/origin_endpoint_resource_gen.go index f186e03796..19c8ff9d69 100644 --- a/internal/aws/mediapackage/origin_endpoint_resource_gen.go +++ b/internal/aws/mediapackage/origin_endpoint_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediapackage/packaging_configuration_resource_gen.go b/internal/aws/mediapackage/packaging_configuration_resource_gen.go index 05169e85fb..1d25fbb3d3 100644 --- a/internal/aws/mediapackage/packaging_configuration_resource_gen.go +++ b/internal/aws/mediapackage/packaging_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mediapackage/packaging_group_plural_data_source_gen.go b/internal/aws/mediapackage/packaging_group_plural_data_source_gen.go index 8593b6a8fc..21ca27e8ee 100644 --- a/internal/aws/mediapackage/packaging_group_plural_data_source_gen.go +++ b/internal/aws/mediapackage/packaging_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func packagingGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/mediapackage/packaging_group_resource_gen.go b/internal/aws/mediapackage/packaging_group_resource_gen.go index 5da3b85edc..a5b8a8dfa5 100644 --- a/internal/aws/mediapackage/packaging_group_resource_gen.go +++ b/internal/aws/mediapackage/packaging_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/mwaa/environment_plural_data_source_gen.go b/internal/aws/mwaa/environment_plural_data_source_gen.go index 545c571a3e..179d0f89a4 100644 --- a/internal/aws/mwaa/environment_plural_data_source_gen.go +++ b/internal/aws/mwaa/environment_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func environmentsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/mwaa/environment_resource_gen.go b/internal/aws/mwaa/environment_resource_gen.go index ae2678aea9..5dd5b1a94b 100644 --- a/internal/aws/mwaa/environment_resource_gen.go +++ b/internal/aws/mwaa/environment_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/networkfirewall/firewall_plural_data_source_gen.go b/internal/aws/networkfirewall/firewall_plural_data_source_gen.go index 704fabe3cd..d322b9a654 100644 --- a/internal/aws/networkfirewall/firewall_plural_data_source_gen.go +++ b/internal/aws/networkfirewall/firewall_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func firewallsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/networkfirewall/firewall_policy_plural_data_source_gen.go b/internal/aws/networkfirewall/firewall_policy_plural_data_source_gen.go index 2bbd693768..7e1e76a660 100644 --- a/internal/aws/networkfirewall/firewall_policy_plural_data_source_gen.go +++ b/internal/aws/networkfirewall/firewall_policy_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func firewallPoliciesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/networkfirewall/firewall_policy_resource_gen.go b/internal/aws/networkfirewall/firewall_policy_resource_gen.go index e7f990033e..a0279bcccc 100644 --- a/internal/aws/networkfirewall/firewall_policy_resource_gen.go +++ b/internal/aws/networkfirewall/firewall_policy_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -173,7 +172,7 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) map[string]tfsdk.Attribute{ "stateful_rule_group_references": { // Property: StatefulRuleGroupReferences - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "resource_arn": { // Property: ResourceArn @@ -185,13 +184,13 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "stateless_custom_actions": { // Property: StatelessCustomActions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action_definition": { // Property: ActionDefinition @@ -203,7 +202,7 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) map[string]tfsdk.Attribute{ "dimensions": { // Property: Dimensions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "value": { // Property: Value @@ -214,7 +213,7 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Required: true, }, @@ -235,23 +234,23 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "stateless_default_actions": { // Property: StatelessDefaultActions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, "stateless_fragment_default_actions": { // Property: StatelessFragmentDefaultActions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, "stateless_rule_group_references": { // Property: StatelessRuleGroupReferences - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "priority": { // Property: Priority @@ -271,7 +270,7 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -353,7 +352,7 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -372,7 +371,7 @@ func firewallPolicyResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/networkfirewall/firewall_policy_singular_data_source_gen.go b/internal/aws/networkfirewall/firewall_policy_singular_data_source_gen.go index 54f77b59c1..376399b221 100644 --- a/internal/aws/networkfirewall/firewall_policy_singular_data_source_gen.go +++ b/internal/aws/networkfirewall/firewall_policy_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -169,7 +168,7 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er map[string]tfsdk.Attribute{ "stateful_rule_group_references": { // Property: StatefulRuleGroupReferences - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "resource_arn": { // Property: ResourceArn @@ -178,13 +177,13 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "stateless_custom_actions": { // Property: StatelessCustomActions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action_definition": { // Property: ActionDefinition @@ -196,7 +195,7 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er map[string]tfsdk.Attribute{ "dimensions": { // Property: Dimensions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "value": { // Property: Value @@ -204,7 +203,7 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -222,23 +221,23 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "stateless_default_actions": { // Property: StatelessDefaultActions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "stateless_fragment_default_actions": { // Property: StatelessFragmentDefaultActions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "stateless_rule_group_references": { // Property: StatelessRuleGroupReferences - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "priority": { // Property: Priority @@ -252,7 +251,7 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -328,7 +327,7 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -341,7 +340,7 @@ func firewallPolicyDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/networkfirewall/firewall_resource_gen.go b/internal/aws/networkfirewall/firewall_resource_gen.go index 3496ef6c44..73c3d3aa5d 100644 --- a/internal/aws/networkfirewall/firewall_resource_gen.go +++ b/internal/aws/networkfirewall/firewall_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -158,7 +157,7 @@ func firewallResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "subnet_id": { // Property: SubnetId @@ -167,7 +166,7 @@ func firewallResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MinItems: 1, }, ), @@ -201,7 +200,7 @@ func firewallResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -220,7 +219,7 @@ func firewallResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/networkfirewall/firewall_singular_data_source_gen.go b/internal/aws/networkfirewall/firewall_singular_data_source_gen.go index 8cba78f603..5f32430a21 100644 --- a/internal/aws/networkfirewall/firewall_singular_data_source_gen.go +++ b/internal/aws/networkfirewall/firewall_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -145,7 +144,7 @@ func firewallDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "subnet_id": { // Property: SubnetId @@ -154,7 +153,7 @@ func firewallDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -186,7 +185,7 @@ func firewallDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -199,7 +198,7 @@ func firewallDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/networkfirewall/logging_configuration_resource_gen.go b/internal/aws/networkfirewall/logging_configuration_resource_gen.go index ce3f009f66..40802dcf10 100644 --- a/internal/aws/networkfirewall/logging_configuration_resource_gen.go +++ b/internal/aws/networkfirewall/logging_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/networkfirewall/rule_group_plural_data_source_gen.go b/internal/aws/networkfirewall/rule_group_plural_data_source_gen.go index e310398ee9..ecd2f2f580 100644 --- a/internal/aws/networkfirewall/rule_group_plural_data_source_gen.go +++ b/internal/aws/networkfirewall/rule_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func ruleGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/networkfirewall/rule_group_resource_gen.go b/internal/aws/networkfirewall/rule_group_resource_gen.go index c609323f52..d04d822016 100644 --- a/internal/aws/networkfirewall/rule_group_resource_gen.go +++ b/internal/aws/networkfirewall/rule_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -555,7 +554,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "definition": { // Property: Definition - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, @@ -570,7 +569,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "definition": { // Property: Definition - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, @@ -603,12 +602,12 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, "target_types": { // Property: TargetTypes - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, "targets": { // Property: Targets - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, }, @@ -625,7 +624,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, "stateful_rules": { // Property: StatefulRules - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action": { // Property: Action @@ -720,7 +719,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, "rule_options": { // Property: RuleOptions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "keyword": { // Property: Keyword @@ -732,16 +731,16 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, "settings": { // Property: Settings - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -751,7 +750,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "custom_actions": { // Property: CustomActions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action_definition": { // Property: ActionDefinition @@ -763,7 +762,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "dimensions": { // Property: Dimensions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "value": { // Property: Value @@ -774,7 +773,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Required: true, }, @@ -795,13 +794,13 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "stateless_rules": { // Property: StatelessRules - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "priority": { // Property: Priority @@ -817,7 +816,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "actions": { // Property: Actions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, "match_attributes": { @@ -826,7 +825,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "destination_ports": { // Property: DestinationPorts - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "from_port": { // Property: FromPort @@ -845,13 +844,13 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "destinations": { // Property: Destinations - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "address_definition": { // Property: AddressDefinition @@ -862,18 +861,18 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "protocols": { // Property: Protocols - Type: providertypes.SetType{ElemType: types.NumberType}, + Type: types.SetType{ElemType: types.NumberType}, Optional: true, }, "source_ports": { // Property: SourcePorts - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "from_port": { // Property: FromPort @@ -892,13 +891,13 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "sources": { // Property: Sources - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "address_definition": { // Property: AddressDefinition @@ -909,26 +908,26 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, "tcp_flags": { // Property: TCPFlags - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "flags": { // Property: Flags - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Required: true, }, "masks": { // Property: Masks - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -941,7 +940,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Required: true, }, @@ -1031,7 +1030,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -1050,7 +1049,7 @@ func ruleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/networkfirewall/rule_group_singular_data_source_gen.go b/internal/aws/networkfirewall/rule_group_singular_data_source_gen.go index cd0d2e9748..bc41f519c3 100644 --- a/internal/aws/networkfirewall/rule_group_singular_data_source_gen.go +++ b/internal/aws/networkfirewall/rule_group_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -548,7 +547,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) map[string]tfsdk.Attribute{ "definition": { // Property: Definition - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -563,7 +562,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) map[string]tfsdk.Attribute{ "definition": { // Property: Definition - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -590,12 +589,12 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "target_types": { // Property: TargetTypes - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "targets": { // Property: Targets - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -609,7 +608,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "stateful_rules": { // Property: StatefulRules - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action": { // Property: Action @@ -656,7 +655,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "rule_options": { // Property: RuleOptions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "keyword": { // Property: Keyword @@ -665,16 +664,16 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "settings": { // Property: Settings - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -684,7 +683,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) map[string]tfsdk.Attribute{ "custom_actions": { // Property: CustomActions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action_definition": { // Property: ActionDefinition @@ -696,7 +695,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) map[string]tfsdk.Attribute{ "dimensions": { // Property: Dimensions - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "value": { // Property: Value @@ -704,7 +703,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -722,13 +721,13 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "stateless_rules": { // Property: StatelessRules - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "priority": { // Property: Priority @@ -741,7 +740,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) map[string]tfsdk.Attribute{ "actions": { // Property: Actions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "match_attributes": { @@ -750,7 +749,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) map[string]tfsdk.Attribute{ "destination_ports": { // Property: DestinationPorts - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "from_port": { // Property: FromPort @@ -763,13 +762,13 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "destinations": { // Property: Destinations - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "address_definition": { // Property: AddressDefinition @@ -777,18 +776,18 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "protocols": { // Property: Protocols - Type: providertypes.SetType{ElemType: types.NumberType}, + Type: types.SetType{ElemType: types.NumberType}, Computed: true, }, "source_ports": { // Property: SourcePorts - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "from_port": { // Property: FromPort @@ -801,13 +800,13 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "sources": { // Property: Sources - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "address_definition": { // Property: AddressDefinition @@ -815,26 +814,26 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, "tcp_flags": { // Property: TCPFlags - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "flags": { // Property: Flags - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "masks": { // Property: Masks - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -847,7 +846,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -931,7 +930,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -944,7 +943,7 @@ func ruleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/networkmanager/global_network_plural_data_source_gen.go b/internal/aws/networkmanager/global_network_plural_data_source_gen.go index ab53d7c63e..b88d01cd59 100644 --- a/internal/aws/networkmanager/global_network_plural_data_source_gen.go +++ b/internal/aws/networkmanager/global_network_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func globalNetworksDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/nimblestudio/studio_plural_data_source_gen.go b/internal/aws/nimblestudio/studio_plural_data_source_gen.go index e37a4e2409..7d6ed47bdb 100644 --- a/internal/aws/nimblestudio/studio_plural_data_source_gen.go +++ b/internal/aws/nimblestudio/studio_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func studiosDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/opsworkscm/server_plural_data_source_gen.go b/internal/aws/opsworkscm/server_plural_data_source_gen.go index 37f0939343..59fb55af41 100644 --- a/internal/aws/opsworkscm/server_plural_data_source_gen.go +++ b/internal/aws/opsworkscm/server_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func serversDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/qldb/stream_resource_gen.go b/internal/aws/qldb/stream_resource_gen.go index 2e9c40b7a4..53bb9b5609 100644 --- a/internal/aws/qldb/stream_resource_gen.go +++ b/internal/aws/qldb/stream_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -171,7 +170,7 @@ func streamResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -192,7 +191,7 @@ func streamResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/qldb/stream_singular_data_source_gen.go b/internal/aws/qldb/stream_singular_data_source_gen.go index d14f9ad0e8..e1012b0b0b 100644 --- a/internal/aws/qldb/stream_singular_data_source_gen.go +++ b/internal/aws/qldb/stream_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -151,7 +150,7 @@ func streamDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -166,7 +165,7 @@ func streamDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/quicksight/analysis_resource_gen.go b/internal/aws/quicksight/analysis_resource_gen.go index 5186b0a970..69f9c2b2d7 100644 --- a/internal/aws/quicksight/analysis_resource_gen.go +++ b/internal/aws/quicksight/analysis_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/quicksight/dashboard_resource_gen.go b/internal/aws/quicksight/dashboard_resource_gen.go index 5353bf1bae..35d141efd1 100644 --- a/internal/aws/quicksight/dashboard_resource_gen.go +++ b/internal/aws/quicksight/dashboard_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/quicksight/data_set_resource_gen.go b/internal/aws/quicksight/data_set_resource_gen.go index 4de0ab1b92..4c009ec110 100644 --- a/internal/aws/quicksight/data_set_resource_gen.go +++ b/internal/aws/quicksight/data_set_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/quicksight/data_source_resource_gen.go b/internal/aws/quicksight/data_source_resource_gen.go index 1d48302ce3..2659218517 100644 --- a/internal/aws/quicksight/data_source_resource_gen.go +++ b/internal/aws/quicksight/data_source_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/quicksight/template_resource_gen.go b/internal/aws/quicksight/template_resource_gen.go index 6fd0579680..0767001d7e 100644 --- a/internal/aws/quicksight/template_resource_gen.go +++ b/internal/aws/quicksight/template_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/quicksight/theme_resource_gen.go b/internal/aws/quicksight/theme_resource_gen.go index 5e1b040574..b8d0427a42 100644 --- a/internal/aws/quicksight/theme_resource_gen.go +++ b/internal/aws/quicksight/theme_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/rds/db_proxy_endpoint_plural_data_source_gen.go b/internal/aws/rds/db_proxy_endpoint_plural_data_source_gen.go index 4f36b8dde6..35c579b5cf 100644 --- a/internal/aws/rds/db_proxy_endpoint_plural_data_source_gen.go +++ b/internal/aws/rds/db_proxy_endpoint_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func dBProxyEndpointsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/rds/db_proxy_endpoint_resource_gen.go b/internal/aws/rds/db_proxy_endpoint_resource_gen.go index d01274e6e3..fdf3a91f38 100644 --- a/internal/aws/rds/db_proxy_endpoint_resource_gen.go +++ b/internal/aws/rds/db_proxy_endpoint_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/rds/db_proxy_plural_data_source_gen.go b/internal/aws/rds/db_proxy_plural_data_source_gen.go index c3b2e29fa8..4db1ec1594 100644 --- a/internal/aws/rds/db_proxy_plural_data_source_gen.go +++ b/internal/aws/rds/db_proxy_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func dBProxiesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/rds/db_proxy_resource_gen.go b/internal/aws/rds/db_proxy_resource_gen.go index 006bea326e..a654e323f9 100644 --- a/internal/aws/rds/db_proxy_resource_gen.go +++ b/internal/aws/rds/db_proxy_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/rds/db_proxy_target_group_resource_gen.go b/internal/aws/rds/db_proxy_target_group_resource_gen.go index 3f6f85882f..829bcc09f7 100644 --- a/internal/aws/rds/db_proxy_target_group_resource_gen.go +++ b/internal/aws/rds/db_proxy_target_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/rds/global_cluster_plural_data_source_gen.go b/internal/aws/rds/global_cluster_plural_data_source_gen.go index e6b641bad9..3c0094a88d 100644 --- a/internal/aws/rds/global_cluster_plural_data_source_gen.go +++ b/internal/aws/rds/global_cluster_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func globalClustersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/rds/global_cluster_resource_gen.go b/internal/aws/rds/global_cluster_resource_gen.go index 8afb1c005d..f50d1eb04a 100644 --- a/internal/aws/rds/global_cluster_resource_gen.go +++ b/internal/aws/rds/global_cluster_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/redshift/cluster_plural_data_source_gen.go b/internal/aws/redshift/cluster_plural_data_source_gen.go index 7561b7d761..e8020670b4 100644 --- a/internal/aws/redshift/cluster_plural_data_source_gen.go +++ b/internal/aws/redshift/cluster_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func clustersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/resourcegroups/group_plural_data_source_gen.go b/internal/aws/resourcegroups/group_plural_data_source_gen.go index 0d03bb2408..4a95cb4317 100644 --- a/internal/aws/resourcegroups/group_plural_data_source_gen.go +++ b/internal/aws/resourcegroups/group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func groupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/resourcegroups/group_resource_gen.go b/internal/aws/resourcegroups/group_resource_gen.go index 5d157bc3b7..585e90ae62 100644 --- a/internal/aws/resourcegroups/group_resource_gen.go +++ b/internal/aws/resourcegroups/group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/robomaker/simulation_application_version_resource_gen.go b/internal/aws/robomaker/simulation_application_version_resource_gen.go index e7fa877aa4..defbbaab8c 100644 --- a/internal/aws/robomaker/simulation_application_version_resource_gen.go +++ b/internal/aws/robomaker/simulation_application_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53/health_check_plural_data_source_gen.go b/internal/aws/route53/health_check_plural_data_source_gen.go index 8bf562749a..7d10e77f14 100644 --- a/internal/aws/route53/health_check_plural_data_source_gen.go +++ b/internal/aws/route53/health_check_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func healthChecksDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53/health_check_resource_gen.go b/internal/aws/route53/health_check_resource_gen.go index 49971dcec7..567312a53d 100644 --- a/internal/aws/route53/health_check_resource_gen.go +++ b/internal/aws/route53/health_check_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -363,7 +362,7 @@ func healthCheckResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -384,7 +383,7 @@ func healthCheckResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/route53/health_check_singular_data_source_gen.go b/internal/aws/route53/health_check_singular_data_source_gen.go index 3f3290a03f..33ca17f31a 100644 --- a/internal/aws/route53/health_check_singular_data_source_gen.go +++ b/internal/aws/route53/health_check_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -290,7 +289,7 @@ func healthCheckDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "uniqueItems": true // } Description: "An array of key-value pairs to apply to this resource.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -305,7 +304,7 @@ func healthCheckDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/route53/hosted_zone_plural_data_source_gen.go b/internal/aws/route53/hosted_zone_plural_data_source_gen.go index e1348118a6..ab5915e324 100644 --- a/internal/aws/route53/hosted_zone_plural_data_source_gen.go +++ b/internal/aws/route53/hosted_zone_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func hostedZonesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53/hosted_zone_resource_gen.go b/internal/aws/route53/hosted_zone_resource_gen.go index 52795ca8cc..359d700b1e 100644 --- a/internal/aws/route53/hosted_zone_resource_gen.go +++ b/internal/aws/route53/hosted_zone_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -81,7 +80,7 @@ func hostedZoneResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "Adds, edits, or deletes tags for a health check or a hosted zone.\n\nFor information about using tags for cost allocation, see Using Cost Allocation Tags in the AWS Billing and Cost Management User Guide.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -102,7 +101,7 @@ func hostedZoneResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -204,7 +203,7 @@ func hostedZoneResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A complex type that contains information about the VPCs that are associated with the specified hosted zone.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "vpc_id": { // Property: VPCId @@ -219,7 +218,7 @@ func hostedZoneResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/route53/hosted_zone_singular_data_source_gen.go b/internal/aws/route53/hosted_zone_singular_data_source_gen.go index aaf928b8cb..2a994314e9 100644 --- a/internal/aws/route53/hosted_zone_singular_data_source_gen.go +++ b/internal/aws/route53/hosted_zone_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -77,7 +76,7 @@ func hostedZoneDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "Adds, edits, or deletes tags for a health check or a hosted zone.\n\nFor information about using tags for cost allocation, see Using Cost Allocation Tags in the AWS Billing and Cost Management User Guide.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -92,7 +91,7 @@ func hostedZoneDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -188,7 +187,7 @@ func hostedZoneDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) // "uniqueItems": true // } Description: "A complex type that contains information about the VPCs that are associated with the specified hosted zone.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "vpc_id": { // Property: VPCId @@ -203,7 +202,7 @@ func hostedZoneDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/route53/key_signing_key_resource_gen.go b/internal/aws/route53/key_signing_key_resource_gen.go index 6713add0fc..3e97d10558 100644 --- a/internal/aws/route53/key_signing_key_resource_gen.go +++ b/internal/aws/route53/key_signing_key_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoverycontrol/cluster_plural_data_source_gen.go b/internal/aws/route53recoverycontrol/cluster_plural_data_source_gen.go index a82ad9efc2..72cbcdf43b 100644 --- a/internal/aws/route53recoverycontrol/cluster_plural_data_source_gen.go +++ b/internal/aws/route53recoverycontrol/cluster_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func clustersDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53recoverycontrol/cluster_resource_gen.go b/internal/aws/route53recoverycontrol/cluster_resource_gen.go index d4d386e680..33467cdfb9 100644 --- a/internal/aws/route53recoverycontrol/cluster_resource_gen.go +++ b/internal/aws/route53recoverycontrol/cluster_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoverycontrol/control_panel_plural_data_source_gen.go b/internal/aws/route53recoverycontrol/control_panel_plural_data_source_gen.go index 243025e420..1eb5567f5d 100644 --- a/internal/aws/route53recoverycontrol/control_panel_plural_data_source_gen.go +++ b/internal/aws/route53recoverycontrol/control_panel_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func controlPanelsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53recoverycontrol/control_panel_resource_gen.go b/internal/aws/route53recoverycontrol/control_panel_resource_gen.go index 7bb6695546..4a087e830c 100644 --- a/internal/aws/route53recoverycontrol/control_panel_resource_gen.go +++ b/internal/aws/route53recoverycontrol/control_panel_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoverycontrol/routing_control_resource_gen.go b/internal/aws/route53recoverycontrol/routing_control_resource_gen.go index 49665b996a..7a1c8a4339 100644 --- a/internal/aws/route53recoverycontrol/routing_control_resource_gen.go +++ b/internal/aws/route53recoverycontrol/routing_control_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoverycontrol/safety_rule_resource_gen.go b/internal/aws/route53recoverycontrol/safety_rule_resource_gen.go index 862237813a..36150b8999 100644 --- a/internal/aws/route53recoverycontrol/safety_rule_resource_gen.go +++ b/internal/aws/route53recoverycontrol/safety_rule_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoveryreadiness/cell_plural_data_source_gen.go b/internal/aws/route53recoveryreadiness/cell_plural_data_source_gen.go index a1bdf4d3ca..8bb25ca961 100644 --- a/internal/aws/route53recoveryreadiness/cell_plural_data_source_gen.go +++ b/internal/aws/route53recoveryreadiness/cell_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func cellsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53recoveryreadiness/cell_resource_gen.go b/internal/aws/route53recoveryreadiness/cell_resource_gen.go index c13165fab9..85d7a8e28d 100644 --- a/internal/aws/route53recoveryreadiness/cell_resource_gen.go +++ b/internal/aws/route53recoveryreadiness/cell_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoveryreadiness/readiness_check_resource_gen.go b/internal/aws/route53recoveryreadiness/readiness_check_resource_gen.go index 3482b1cca4..d1b7077f3a 100644 --- a/internal/aws/route53recoveryreadiness/readiness_check_resource_gen.go +++ b/internal/aws/route53recoveryreadiness/readiness_check_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoveryreadiness/recovery_group_plural_data_source_gen.go b/internal/aws/route53recoveryreadiness/recovery_group_plural_data_source_gen.go index 9729192f7a..12678142fa 100644 --- a/internal/aws/route53recoveryreadiness/recovery_group_plural_data_source_gen.go +++ b/internal/aws/route53recoveryreadiness/recovery_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func recoveryGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53recoveryreadiness/recovery_group_resource_gen.go b/internal/aws/route53recoveryreadiness/recovery_group_resource_gen.go index 67ed31aa42..5f0a9af133 100644 --- a/internal/aws/route53recoveryreadiness/recovery_group_resource_gen.go +++ b/internal/aws/route53recoveryreadiness/recovery_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53recoveryreadiness/resource_set_plural_data_source_gen.go b/internal/aws/route53recoveryreadiness/resource_set_plural_data_source_gen.go index 797143d7e5..e5832d5b24 100644 --- a/internal/aws/route53recoveryreadiness/resource_set_plural_data_source_gen.go +++ b/internal/aws/route53recoveryreadiness/resource_set_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func resourceSetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53recoveryreadiness/resource_set_resource_gen.go b/internal/aws/route53recoveryreadiness/resource_set_resource_gen.go index 7194c335ee..2299fb11e9 100644 --- a/internal/aws/route53recoveryreadiness/resource_set_resource_gen.go +++ b/internal/aws/route53recoveryreadiness/resource_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53resolver/firewall_domain_list_resource_gen.go b/internal/aws/route53resolver/firewall_domain_list_resource_gen.go index 6893dfbd5d..f4bcf8ac2a 100644 --- a/internal/aws/route53resolver/firewall_domain_list_resource_gen.go +++ b/internal/aws/route53resolver/firewall_domain_list_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -234,7 +233,7 @@ func firewallDomainListResourceType(ctx context.Context) (tfsdk.ResourceType, er // "uniqueItems": true // } Description: "Tags", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -255,7 +254,7 @@ func firewallDomainListResourceType(ctx context.Context) (tfsdk.ResourceType, er }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/route53resolver/firewall_domain_list_singular_data_source_gen.go b/internal/aws/route53resolver/firewall_domain_list_singular_data_source_gen.go index 9813f1e70f..c2cf9e34ca 100644 --- a/internal/aws/route53resolver/firewall_domain_list_singular_data_source_gen.go +++ b/internal/aws/route53resolver/firewall_domain_list_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -218,7 +217,7 @@ func firewallDomainListDataSourceType(ctx context.Context) (tfsdk.DataSourceType // "uniqueItems": true // } Description: "Tags", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -233,7 +232,7 @@ func firewallDomainListDataSourceType(ctx context.Context) (tfsdk.DataSourceType Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/route53resolver/firewall_rule_group_association_resource_gen.go b/internal/aws/route53resolver/firewall_rule_group_association_resource_gen.go index 55f098475f..717a5bc54a 100644 --- a/internal/aws/route53resolver/firewall_rule_group_association_resource_gen.go +++ b/internal/aws/route53resolver/firewall_rule_group_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -228,7 +227,7 @@ func firewallRuleGroupAssociationResourceType(ctx context.Context) (tfsdk.Resour // "uniqueItems": true // } Description: "Tags", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -249,7 +248,7 @@ func firewallRuleGroupAssociationResourceType(ctx context.Context) (tfsdk.Resour }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/route53resolver/firewall_rule_group_association_singular_data_source_gen.go b/internal/aws/route53resolver/firewall_rule_group_association_singular_data_source_gen.go index f8e11e7cae..7e76038280 100644 --- a/internal/aws/route53resolver/firewall_rule_group_association_singular_data_source_gen.go +++ b/internal/aws/route53resolver/firewall_rule_group_association_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -212,7 +211,7 @@ func firewallRuleGroupAssociationDataSourceType(ctx context.Context) (tfsdk.Data // "uniqueItems": true // } Description: "Tags", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -227,7 +226,7 @@ func firewallRuleGroupAssociationDataSourceType(ctx context.Context) (tfsdk.Data Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/route53resolver/firewall_rule_group_resource_gen.go b/internal/aws/route53resolver/firewall_rule_group_resource_gen.go index c46aff6af1..cd24dfc090 100644 --- a/internal/aws/route53resolver/firewall_rule_group_resource_gen.go +++ b/internal/aws/route53resolver/firewall_rule_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -129,7 +128,7 @@ func firewallRuleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, err // "uniqueItems": true // } Description: "FirewallRules", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action": { // Property: Action @@ -202,7 +201,7 @@ func firewallRuleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, err Required: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, @@ -354,7 +353,7 @@ func firewallRuleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, err // "uniqueItems": true // } Description: "Tags", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -375,7 +374,7 @@ func firewallRuleGroupResourceType(ctx context.Context) (tfsdk.ResourceType, err }, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Optional: true, }, diff --git a/internal/aws/route53resolver/firewall_rule_group_singular_data_source_gen.go b/internal/aws/route53resolver/firewall_rule_group_singular_data_source_gen.go index 1c9341da6e..8f5bcf2dd5 100644 --- a/internal/aws/route53resolver/firewall_rule_group_singular_data_source_gen.go +++ b/internal/aws/route53resolver/firewall_rule_group_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -128,7 +127,7 @@ func firewallRuleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, // "uniqueItems": true // } Description: "FirewallRules", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "action": { // Property: Action @@ -173,7 +172,7 @@ func firewallRuleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -318,7 +317,7 @@ func firewallRuleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, // "uniqueItems": true // } Description: "Tags", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -333,7 +332,7 @@ func firewallRuleGroupDataSourceType(ctx context.Context) (tfsdk.DataSourceType, Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/route53resolver/resolver_dnssec_config_plural_data_source_gen.go b/internal/aws/route53resolver/resolver_dnssec_config_plural_data_source_gen.go index 32d60db702..fd0aa21f2c 100644 --- a/internal/aws/route53resolver/resolver_dnssec_config_plural_data_source_gen.go +++ b/internal/aws/route53resolver/resolver_dnssec_config_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func resolverDNSSECConfigsDataSourceType(ctx context.Context) (tfsdk.DataSourceT }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53resolver/resolver_dnssec_config_resource_gen.go b/internal/aws/route53resolver/resolver_dnssec_config_resource_gen.go index 7e29f158f9..6bed011ce9 100644 --- a/internal/aws/route53resolver/resolver_dnssec_config_resource_gen.go +++ b/internal/aws/route53resolver/resolver_dnssec_config_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53resolver/resolver_query_logging_config_association_plural_data_source_gen.go b/internal/aws/route53resolver/resolver_query_logging_config_association_plural_data_source_gen.go index b77eb27a2e..d539ec54bc 100644 --- a/internal/aws/route53resolver/resolver_query_logging_config_association_plural_data_source_gen.go +++ b/internal/aws/route53resolver/resolver_query_logging_config_association_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func resolverQueryLoggingConfigAssociationsDataSourceType(ctx context.Context) ( }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53resolver/resolver_query_logging_config_association_resource_gen.go b/internal/aws/route53resolver/resolver_query_logging_config_association_resource_gen.go index 07f6c4a1f9..b00cb17722 100644 --- a/internal/aws/route53resolver/resolver_query_logging_config_association_resource_gen.go +++ b/internal/aws/route53resolver/resolver_query_logging_config_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/route53resolver/resolver_query_logging_config_plural_data_source_gen.go b/internal/aws/route53resolver/resolver_query_logging_config_plural_data_source_gen.go index 9cb7239dbb..9d44652bb0 100644 --- a/internal/aws/route53resolver/resolver_query_logging_config_plural_data_source_gen.go +++ b/internal/aws/route53resolver/resolver_query_logging_config_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func resolverQueryLoggingConfigsDataSourceType(ctx context.Context) (tfsdk.DataS }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/route53resolver/resolver_query_logging_config_resource_gen.go b/internal/aws/route53resolver/resolver_query_logging_config_resource_gen.go index 4c6b0415aa..75dd05f90d 100644 --- a/internal/aws/route53resolver/resolver_query_logging_config_resource_gen.go +++ b/internal/aws/route53resolver/resolver_query_logging_config_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/s3/access_point_plural_data_source_gen.go b/internal/aws/s3/access_point_plural_data_source_gen.go index d2248407cb..642c2d5d28 100644 --- a/internal/aws/s3/access_point_plural_data_source_gen.go +++ b/internal/aws/s3/access_point_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func accessPointsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/s3/access_point_resource_gen.go b/internal/aws/s3/access_point_resource_gen.go index b66ad252ca..037eb4bff6 100644 --- a/internal/aws/s3/access_point_resource_gen.go +++ b/internal/aws/s3/access_point_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/s3/storage_lens_plural_data_source_gen.go b/internal/aws/s3/storage_lens_plural_data_source_gen.go index 47f11f34f3..5a9e95fa8a 100644 --- a/internal/aws/s3/storage_lens_plural_data_source_gen.go +++ b/internal/aws/s3/storage_lens_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func storageLensesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/s3/storage_lens_resource_gen.go b/internal/aws/s3/storage_lens_resource_gen.go index 7f3f42f965..8c77e7d1d9 100644 --- a/internal/aws/s3/storage_lens_resource_gen.go +++ b/internal/aws/s3/storage_lens_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -447,12 +446,12 @@ func storageLensResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "buckets": { // Property: Buckets - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "regions": { // Property: Regions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, @@ -478,12 +477,12 @@ func storageLensResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "buckets": { // Property: Buckets - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "regions": { // Property: Regions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, }, @@ -539,7 +538,7 @@ func storageLensResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "A set of tags (key-value pairs) for this Amazon S3 Storage Lens configuration.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -558,7 +557,7 @@ func storageLensResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 50, }, ), diff --git a/internal/aws/s3/storage_lens_singular_data_source_gen.go b/internal/aws/s3/storage_lens_singular_data_source_gen.go index 7cafc7857d..ef203e030e 100644 --- a/internal/aws/s3/storage_lens_singular_data_source_gen.go +++ b/internal/aws/s3/storage_lens_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -435,12 +434,12 @@ func storageLensDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error map[string]tfsdk.Attribute{ "buckets": { // Property: Buckets - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "regions": { // Property: Regions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -460,12 +459,12 @@ func storageLensDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error map[string]tfsdk.Attribute{ "buckets": { // Property: Buckets - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "regions": { // Property: Regions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, }, @@ -521,7 +520,7 @@ func storageLensDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error // "uniqueItems": true // } Description: "A set of tags (key-value pairs) for this Amazon S3 Storage Lens configuration.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -534,7 +533,7 @@ func storageLensDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/s3objectlambda/access_point_plural_data_source_gen.go b/internal/aws/s3objectlambda/access_point_plural_data_source_gen.go index c65eb4257e..fa38d2fe93 100644 --- a/internal/aws/s3objectlambda/access_point_plural_data_source_gen.go +++ b/internal/aws/s3objectlambda/access_point_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func accessPointsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/s3objectlambda/access_point_policy_resource_gen.go b/internal/aws/s3objectlambda/access_point_policy_resource_gen.go index 0f0ba06028..2417a93d26 100644 --- a/internal/aws/s3objectlambda/access_point_policy_resource_gen.go +++ b/internal/aws/s3objectlambda/access_point_policy_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/s3objectlambda/access_point_resource_gen.go b/internal/aws/s3objectlambda/access_point_resource_gen.go index b480badde5..8733d40eff 100644 --- a/internal/aws/s3objectlambda/access_point_resource_gen.go +++ b/internal/aws/s3objectlambda/access_point_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -127,7 +126,7 @@ func accessPointResourceType(ctx context.Context) (tfsdk.ResourceType, error) { map[string]tfsdk.Attribute{ "allowed_features": { // Property: AllowedFeatures - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "cloudwatch_metrics_enabled": { @@ -145,11 +144,11 @@ func accessPointResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, "transformation_configurations": { // Property: TransformationConfigurations - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "actions": { // Property: Actions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, }, "content_transformation": { @@ -158,7 +157,7 @@ func accessPointResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Optional: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Required: true, }, diff --git a/internal/aws/s3objectlambda/access_point_singular_data_source_gen.go b/internal/aws/s3objectlambda/access_point_singular_data_source_gen.go index fca5db6271..4933dcb861 100644 --- a/internal/aws/s3objectlambda/access_point_singular_data_source_gen.go +++ b/internal/aws/s3objectlambda/access_point_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -120,7 +119,7 @@ func accessPointDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error map[string]tfsdk.Attribute{ "allowed_features": { // Property: AllowedFeatures - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "cloudwatch_metrics_enabled": { @@ -135,11 +134,11 @@ func accessPointDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error }, "transformation_configurations": { // Property: TransformationConfigurations - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "actions": { // Property: Actions - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "content_transformation": { @@ -148,7 +147,7 @@ func accessPointDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/s3outposts/access_point_resource_gen.go b/internal/aws/s3outposts/access_point_resource_gen.go index 876c08c3f2..28f1c096b4 100644 --- a/internal/aws/s3outposts/access_point_resource_gen.go +++ b/internal/aws/s3outposts/access_point_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/s3outposts/bucket_policy_resource_gen.go b/internal/aws/s3outposts/bucket_policy_resource_gen.go index b60d0c78cd..53daa1a253 100644 --- a/internal/aws/s3outposts/bucket_policy_resource_gen.go +++ b/internal/aws/s3outposts/bucket_policy_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/s3outposts/endpoint_plural_data_source_gen.go b/internal/aws/s3outposts/endpoint_plural_data_source_gen.go index 1e12f8cec1..60b08b017e 100644 --- a/internal/aws/s3outposts/endpoint_plural_data_source_gen.go +++ b/internal/aws/s3outposts/endpoint_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func endpointsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/app_image_config_plural_data_source_gen.go b/internal/aws/sagemaker/app_image_config_plural_data_source_gen.go index 12d2458983..5b573eb76b 100644 --- a/internal/aws/sagemaker/app_image_config_plural_data_source_gen.go +++ b/internal/aws/sagemaker/app_image_config_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func appImageConfigsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/app_image_config_resource_gen.go b/internal/aws/sagemaker/app_image_config_resource_gen.go index 740c85333b..79d3b92717 100644 --- a/internal/aws/sagemaker/app_image_config_resource_gen.go +++ b/internal/aws/sagemaker/app_image_config_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/app_plural_data_source_gen.go b/internal/aws/sagemaker/app_plural_data_source_gen.go index d2fe8255de..055e13fdec 100644 --- a/internal/aws/sagemaker/app_plural_data_source_gen.go +++ b/internal/aws/sagemaker/app_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func appsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/app_resource_gen.go b/internal/aws/sagemaker/app_resource_gen.go index a1ff6a233b..5b4ba52754 100644 --- a/internal/aws/sagemaker/app_resource_gen.go +++ b/internal/aws/sagemaker/app_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/data_quality_job_definition_resource_gen.go b/internal/aws/sagemaker/data_quality_job_definition_resource_gen.go index 09129242cd..4054a29482 100644 --- a/internal/aws/sagemaker/data_quality_job_definition_resource_gen.go +++ b/internal/aws/sagemaker/data_quality_job_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/device_fleet_resource_gen.go b/internal/aws/sagemaker/device_fleet_resource_gen.go index 59d2bf0c30..8afc3cb188 100644 --- a/internal/aws/sagemaker/device_fleet_resource_gen.go +++ b/internal/aws/sagemaker/device_fleet_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/device_resource_gen.go b/internal/aws/sagemaker/device_resource_gen.go index b405dc5185..ee6098a711 100644 --- a/internal/aws/sagemaker/device_resource_gen.go +++ b/internal/aws/sagemaker/device_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/domain_plural_data_source_gen.go b/internal/aws/sagemaker/domain_plural_data_source_gen.go index 12ceca7ab7..05ed92ce94 100644 --- a/internal/aws/sagemaker/domain_plural_data_source_gen.go +++ b/internal/aws/sagemaker/domain_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func domainsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/domain_resource_gen.go b/internal/aws/sagemaker/domain_resource_gen.go index dc25c2f34e..c67499d021 100644 --- a/internal/aws/sagemaker/domain_resource_gen.go +++ b/internal/aws/sagemaker/domain_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/feature_group_plural_data_source_gen.go b/internal/aws/sagemaker/feature_group_plural_data_source_gen.go index 0e86632e89..349388b225 100644 --- a/internal/aws/sagemaker/feature_group_plural_data_source_gen.go +++ b/internal/aws/sagemaker/feature_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func featureGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/feature_group_resource_gen.go b/internal/aws/sagemaker/feature_group_resource_gen.go index dd4f368f54..5a2a968d52 100644 --- a/internal/aws/sagemaker/feature_group_resource_gen.go +++ b/internal/aws/sagemaker/feature_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/image_plural_data_source_gen.go b/internal/aws/sagemaker/image_plural_data_source_gen.go index aec8f314df..f5eb0afdf2 100644 --- a/internal/aws/sagemaker/image_plural_data_source_gen.go +++ b/internal/aws/sagemaker/image_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func imagesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/image_resource_gen.go b/internal/aws/sagemaker/image_resource_gen.go index e988e490ad..d9da52484f 100644 --- a/internal/aws/sagemaker/image_resource_gen.go +++ b/internal/aws/sagemaker/image_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/image_version_resource_gen.go b/internal/aws/sagemaker/image_version_resource_gen.go index ceed3862b6..c806a5ee76 100644 --- a/internal/aws/sagemaker/image_version_resource_gen.go +++ b/internal/aws/sagemaker/image_version_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/model_bias_job_definition_resource_gen.go b/internal/aws/sagemaker/model_bias_job_definition_resource_gen.go index 4e36edeaa0..3815f104c3 100644 --- a/internal/aws/sagemaker/model_bias_job_definition_resource_gen.go +++ b/internal/aws/sagemaker/model_bias_job_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/model_explainability_job_definition_resource_gen.go b/internal/aws/sagemaker/model_explainability_job_definition_resource_gen.go index 77b17e8266..5984ce9cc9 100644 --- a/internal/aws/sagemaker/model_explainability_job_definition_resource_gen.go +++ b/internal/aws/sagemaker/model_explainability_job_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/model_package_group_plural_data_source_gen.go b/internal/aws/sagemaker/model_package_group_plural_data_source_gen.go index dddaa80e04..0eb1203bc0 100644 --- a/internal/aws/sagemaker/model_package_group_plural_data_source_gen.go +++ b/internal/aws/sagemaker/model_package_group_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func modelPackageGroupsDataSourceType(ctx context.Context) (tfsdk.DataSourceType }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/model_package_group_resource_gen.go b/internal/aws/sagemaker/model_package_group_resource_gen.go index 4a4ddbfb0f..090488e351 100644 --- a/internal/aws/sagemaker/model_package_group_resource_gen.go +++ b/internal/aws/sagemaker/model_package_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/model_quality_job_definition_resource_gen.go b/internal/aws/sagemaker/model_quality_job_definition_resource_gen.go index d424491d03..939c016fcf 100644 --- a/internal/aws/sagemaker/model_quality_job_definition_resource_gen.go +++ b/internal/aws/sagemaker/model_quality_job_definition_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/monitoring_schedule_plural_data_source_gen.go b/internal/aws/sagemaker/monitoring_schedule_plural_data_source_gen.go index 25162f9f41..52114925ba 100644 --- a/internal/aws/sagemaker/monitoring_schedule_plural_data_source_gen.go +++ b/internal/aws/sagemaker/monitoring_schedule_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func monitoringSchedulesDataSourceType(ctx context.Context) (tfsdk.DataSourceTyp }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/monitoring_schedule_resource_gen.go b/internal/aws/sagemaker/monitoring_schedule_resource_gen.go index 6e0b8d88e8..fef886bcec 100644 --- a/internal/aws/sagemaker/monitoring_schedule_resource_gen.go +++ b/internal/aws/sagemaker/monitoring_schedule_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/pipeline_plural_data_source_gen.go b/internal/aws/sagemaker/pipeline_plural_data_source_gen.go index 5f82ee5af3..169477f968 100644 --- a/internal/aws/sagemaker/pipeline_plural_data_source_gen.go +++ b/internal/aws/sagemaker/pipeline_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func pipelinesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/pipeline_resource_gen.go b/internal/aws/sagemaker/pipeline_resource_gen.go index 6b2a40869d..c2468d5a48 100644 --- a/internal/aws/sagemaker/pipeline_resource_gen.go +++ b/internal/aws/sagemaker/pipeline_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/project_plural_data_source_gen.go b/internal/aws/sagemaker/project_plural_data_source_gen.go index c20f74f8af..73e58d1fcd 100644 --- a/internal/aws/sagemaker/project_plural_data_source_gen.go +++ b/internal/aws/sagemaker/project_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func projectsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/project_resource_gen.go b/internal/aws/sagemaker/project_resource_gen.go index 3ab2aa5199..c2863b1350 100644 --- a/internal/aws/sagemaker/project_resource_gen.go +++ b/internal/aws/sagemaker/project_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sagemaker/user_profile_plural_data_source_gen.go b/internal/aws/sagemaker/user_profile_plural_data_source_gen.go index ea14282e04..b9e41712c2 100644 --- a/internal/aws/sagemaker/user_profile_plural_data_source_gen.go +++ b/internal/aws/sagemaker/user_profile_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func userProfilesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/sagemaker/user_profile_resource_gen.go b/internal/aws/sagemaker/user_profile_resource_gen.go index 0219787edd..a27a62758c 100644 --- a/internal/aws/sagemaker/user_profile_resource_gen.go +++ b/internal/aws/sagemaker/user_profile_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/servicecatalog/cloudformation_provisioned_product_resource_gen.go b/internal/aws/servicecatalog/cloudformation_provisioned_product_resource_gen.go index b71f98b259..6acb44ef27 100644 --- a/internal/aws/servicecatalog/cloudformation_provisioned_product_resource_gen.go +++ b/internal/aws/servicecatalog/cloudformation_provisioned_product_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/servicecatalog/service_action_association_resource_gen.go b/internal/aws/servicecatalog/service_action_association_resource_gen.go index b9b87104e6..72a63be030 100644 --- a/internal/aws/servicecatalog/service_action_association_resource_gen.go +++ b/internal/aws/servicecatalog/service_action_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/servicecatalog/service_action_plural_data_source_gen.go b/internal/aws/servicecatalog/service_action_plural_data_source_gen.go index 5c5e4c0a1b..da51c4baaa 100644 --- a/internal/aws/servicecatalog/service_action_plural_data_source_gen.go +++ b/internal/aws/servicecatalog/service_action_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func serviceActionsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/servicecatalog/service_action_resource_gen.go b/internal/aws/servicecatalog/service_action_resource_gen.go index 5b83c69125..20606eaf12 100644 --- a/internal/aws/servicecatalog/service_action_resource_gen.go +++ b/internal/aws/servicecatalog/service_action_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/servicecatalogappregistry/application_resource_gen.go b/internal/aws/servicecatalogappregistry/application_resource_gen.go index d6f2763aa1..e68eed0a02 100644 --- a/internal/aws/servicecatalogappregistry/application_resource_gen.go +++ b/internal/aws/servicecatalogappregistry/application_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/servicecatalogappregistry/attribute_group_association_resource_gen.go b/internal/aws/servicecatalogappregistry/attribute_group_association_resource_gen.go index 36e60f0023..f132e02e15 100644 --- a/internal/aws/servicecatalogappregistry/attribute_group_association_resource_gen.go +++ b/internal/aws/servicecatalogappregistry/attribute_group_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/servicecatalogappregistry/attribute_group_resource_gen.go b/internal/aws/servicecatalogappregistry/attribute_group_resource_gen.go index 6eab3c7948..3c4c0a2e44 100644 --- a/internal/aws/servicecatalogappregistry/attribute_group_resource_gen.go +++ b/internal/aws/servicecatalogappregistry/attribute_group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/servicecatalogappregistry/resource_association_resource_gen.go b/internal/aws/servicecatalogappregistry/resource_association_resource_gen.go index b79336350f..95593562e1 100644 --- a/internal/aws/servicecatalogappregistry/resource_association_resource_gen.go +++ b/internal/aws/servicecatalogappregistry/resource_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ses/configuration_set_plural_data_source_gen.go b/internal/aws/ses/configuration_set_plural_data_source_gen.go index 106e7d14a7..1b51bf78d1 100644 --- a/internal/aws/ses/configuration_set_plural_data_source_gen.go +++ b/internal/aws/ses/configuration_set_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func configurationSetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ses/configuration_set_resource_gen.go b/internal/aws/ses/configuration_set_resource_gen.go index 76be001d4d..1c0d1a2c87 100644 --- a/internal/aws/ses/configuration_set_resource_gen.go +++ b/internal/aws/ses/configuration_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ses/contact_list_plural_data_source_gen.go b/internal/aws/ses/contact_list_plural_data_source_gen.go index 4e83f655e5..23bcbd273b 100644 --- a/internal/aws/ses/contact_list_plural_data_source_gen.go +++ b/internal/aws/ses/contact_list_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func contactListsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ses/contact_list_resource_gen.go b/internal/aws/ses/contact_list_resource_gen.go index 56920d1c3a..439d04962c 100644 --- a/internal/aws/ses/contact_list_resource_gen.go +++ b/internal/aws/ses/contact_list_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/signer/signing_profile_plural_data_source_gen.go b/internal/aws/signer/signing_profile_plural_data_source_gen.go index 8075f7a8b9..0d7e43335b 100644 --- a/internal/aws/signer/signing_profile_plural_data_source_gen.go +++ b/internal/aws/signer/signing_profile_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func signingProfilesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/signer/signing_profile_resource_gen.go b/internal/aws/signer/signing_profile_resource_gen.go index 51253e74d1..3d7bedbbac 100644 --- a/internal/aws/signer/signing_profile_resource_gen.go +++ b/internal/aws/signer/signing_profile_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ssm/association_resource_gen.go b/internal/aws/ssm/association_resource_gen.go index 46b19d4873..6cf44d869e 100644 --- a/internal/aws/ssm/association_resource_gen.go +++ b/internal/aws/ssm/association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ssm/document_resource_gen.go b/internal/aws/ssm/document_resource_gen.go index 2e429e8926..c17b376910 100644 --- a/internal/aws/ssm/document_resource_gen.go +++ b/internal/aws/ssm/document_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ssm/resource_data_sync_plural_data_source_gen.go b/internal/aws/ssm/resource_data_sync_plural_data_source_gen.go index 867ac3271e..7f551735f8 100644 --- a/internal/aws/ssm/resource_data_sync_plural_data_source_gen.go +++ b/internal/aws/ssm/resource_data_sync_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func resourceDataSyncsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ssm/resource_data_sync_resource_gen.go b/internal/aws/ssm/resource_data_sync_resource_gen.go index 1eb3f56a03..d209dd8d5c 100644 --- a/internal/aws/ssm/resource_data_sync_resource_gen.go +++ b/internal/aws/ssm/resource_data_sync_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ssmcontacts/contact_channel_resource_gen.go b/internal/aws/ssmcontacts/contact_channel_resource_gen.go index 9f78ac830e..ba29a92a68 100644 --- a/internal/aws/ssmcontacts/contact_channel_resource_gen.go +++ b/internal/aws/ssmcontacts/contact_channel_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ssmcontacts/contact_resource_gen.go b/internal/aws/ssmcontacts/contact_resource_gen.go index edcf8c3079..775356f97d 100644 --- a/internal/aws/ssmcontacts/contact_resource_gen.go +++ b/internal/aws/ssmcontacts/contact_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/ssmincidents/replication_set_plural_data_source_gen.go b/internal/aws/ssmincidents/replication_set_plural_data_source_gen.go index d319143d85..e02ca1e3d4 100644 --- a/internal/aws/ssmincidents/replication_set_plural_data_source_gen.go +++ b/internal/aws/ssmincidents/replication_set_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func replicationSetsDataSourceType(ctx context.Context) (tfsdk.DataSourceType, e }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ssmincidents/replication_set_resource_gen.go b/internal/aws/ssmincidents/replication_set_resource_gen.go index 01a288d375..ca114ff0d1 100644 --- a/internal/aws/ssmincidents/replication_set_resource_gen.go +++ b/internal/aws/ssmincidents/replication_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -88,7 +87,7 @@ func replicationSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "region_configuration": { // Property: RegionConfiguration @@ -118,7 +117,7 @@ func replicationSetResourceType(ctx context.Context) (tfsdk.ResourceType, error) }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MinItems: 1, MaxItems: 3, }, diff --git a/internal/aws/ssmincidents/replication_set_singular_data_source_gen.go b/internal/aws/ssmincidents/replication_set_singular_data_source_gen.go index a402828dbc..52b3ec177f 100644 --- a/internal/aws/ssmincidents/replication_set_singular_data_source_gen.go +++ b/internal/aws/ssmincidents/replication_set_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -83,7 +82,7 @@ func replicationSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er // "type": "array", // "uniqueItems": true // } - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "region_configuration": { // Property: RegionConfiguration @@ -107,7 +106,7 @@ func replicationSetDataSourceType(ctx context.Context) (tfsdk.DataSourceType, er Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/ssmincidents/response_plan_plural_data_source_gen.go b/internal/aws/ssmincidents/response_plan_plural_data_source_gen.go index d4156055a6..768207a355 100644 --- a/internal/aws/ssmincidents/response_plan_plural_data_source_gen.go +++ b/internal/aws/ssmincidents/response_plan_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func responsePlansDataSourceType(ctx context.Context) (tfsdk.DataSourceType, err }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/ssmincidents/response_plan_resource_gen.go b/internal/aws/ssmincidents/response_plan_resource_gen.go index e219eb0655..697fcd774b 100644 --- a/internal/aws/ssmincidents/response_plan_resource_gen.go +++ b/internal/aws/ssmincidents/response_plan_resource_gen.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) @@ -139,7 +138,7 @@ func responsePlanResourceType(ctx context.Context) (tfsdk.ResourceType, error) { "parameters": { // Property: Parameters Description: "The parameters to set when starting the SSM automation document.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -159,7 +158,7 @@ func responsePlanResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MaxItems: 200, }, ), @@ -288,11 +287,11 @@ func responsePlanResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "The list of engagements to use.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Optional: true, Computed: true, PlanModifiers: []tfsdk.AttributePlanModifier{ - DefaultValue(providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{}}), + DefaultValue(types.Set{ElemType: types.StringType, Elems: []attr.Value{}}), }, }, "incident_template": { @@ -469,7 +468,7 @@ func responsePlanResourceType(ctx context.Context) (tfsdk.ResourceType, error) { // "uniqueItems": true // } Description: "The tags to apply to the response plan.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -488,7 +487,7 @@ func responsePlanResourceType(ctx context.Context) (tfsdk.ResourceType, error) { }, }, }, - providertypes.SetNestedAttributesOptions{ + tfsdk.SetNestedAttributesOptions{ MinItems: 1, MaxItems: 50, }, @@ -496,7 +495,7 @@ func responsePlanResourceType(ctx context.Context) (tfsdk.ResourceType, error) { Optional: true, Computed: true, PlanModifiers: []tfsdk.AttributePlanModifier{ - DefaultValue(providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{}}), + DefaultValue(types.Set{ElemType: types.StringType, Elems: []attr.Value{}}), }, }, } diff --git a/internal/aws/ssmincidents/response_plan_singular_data_source_gen.go b/internal/aws/ssmincidents/response_plan_singular_data_source_gen.go index 30b1733ef9..c13147a575 100644 --- a/internal/aws/ssmincidents/response_plan_singular_data_source_gen.go +++ b/internal/aws/ssmincidents/response_plan_singular_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -131,7 +130,7 @@ func responsePlanDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro "parameters": { // Property: Parameters Description: "The parameters to set when starting the SSM automation document.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -144,7 +143,7 @@ func responsePlanDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, @@ -247,7 +246,7 @@ func responsePlanDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro // "uniqueItems": true // } Description: "The list of engagements to use.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, "incident_template": { @@ -401,7 +400,7 @@ func responsePlanDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro // "uniqueItems": true // } Description: "The tags to apply to the response plan.", - Attributes: providertypes.SetNestedAttributes( + Attributes: tfsdk.SetNestedAttributes( map[string]tfsdk.Attribute{ "key": { // Property: Key @@ -414,7 +413,7 @@ func responsePlanDataSourceType(ctx context.Context) (tfsdk.DataSourceType, erro Computed: true, }, }, - providertypes.SetNestedAttributesOptions{}, + tfsdk.SetNestedAttributesOptions{}, ), Computed: true, }, diff --git a/internal/aws/sso/assignment_resource_gen.go b/internal/aws/sso/assignment_resource_gen.go index b4bd4ae65f..8595816eed 100644 --- a/internal/aws/sso/assignment_resource_gen.go +++ b/internal/aws/sso/assignment_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sso/instance_access_control_attribute_configuration_resource_gen.go b/internal/aws/sso/instance_access_control_attribute_configuration_resource_gen.go index 139476541d..674a05d56f 100644 --- a/internal/aws/sso/instance_access_control_attribute_configuration_resource_gen.go +++ b/internal/aws/sso/instance_access_control_attribute_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/sso/permission_set_resource_gen.go b/internal/aws/sso/permission_set_resource_gen.go index 6ba9fa9015..43b050b912 100644 --- a/internal/aws/sso/permission_set_resource_gen.go +++ b/internal/aws/sso/permission_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/stepfunctions/state_machine_resource_gen.go b/internal/aws/stepfunctions/state_machine_resource_gen.go index 6e758e29f7..9eca3b4656 100644 --- a/internal/aws/stepfunctions/state_machine_resource_gen.go +++ b/internal/aws/stepfunctions/state_machine_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/synthetics/canary_plural_data_source_gen.go b/internal/aws/synthetics/canary_plural_data_source_gen.go index fe5c99bba2..9c4da1dff4 100644 --- a/internal/aws/synthetics/canary_plural_data_source_gen.go +++ b/internal/aws/synthetics/canary_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func canariesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/timestream/database_plural_data_source_gen.go b/internal/aws/timestream/database_plural_data_source_gen.go index 27ede4f79b..ceb8b51352 100644 --- a/internal/aws/timestream/database_plural_data_source_gen.go +++ b/internal/aws/timestream/database_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func databasesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/timestream/database_resource_gen.go b/internal/aws/timestream/database_resource_gen.go index a5cde553e3..08b225bfa8 100644 --- a/internal/aws/timestream/database_resource_gen.go +++ b/internal/aws/timestream/database_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/timestream/table_plural_data_source_gen.go b/internal/aws/timestream/table_plural_data_source_gen.go index a8c9d020bc..58a35713e8 100644 --- a/internal/aws/timestream/table_plural_data_source_gen.go +++ b/internal/aws/timestream/table_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func tablesDataSourceType(ctx context.Context) (tfsdk.DataSourceType, error) { }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/timestream/table_resource_gen.go b/internal/aws/timestream/table_resource_gen.go index ac772571be..94a5491f0d 100644 --- a/internal/aws/timestream/table_resource_gen.go +++ b/internal/aws/timestream/table_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/wafv2/ip_set_resource_gen.go b/internal/aws/wafv2/ip_set_resource_gen.go index 774e64bb28..40885e5650 100644 --- a/internal/aws/wafv2/ip_set_resource_gen.go +++ b/internal/aws/wafv2/ip_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/wafv2/logging_configuration_plural_data_source_gen.go b/internal/aws/wafv2/logging_configuration_plural_data_source_gen.go index 6e5a4b6808..ec919e592a 100644 --- a/internal/aws/wafv2/logging_configuration_plural_data_source_gen.go +++ b/internal/aws/wafv2/logging_configuration_plural_data_source_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -27,7 +26,7 @@ func loggingConfigurationsDataSourceType(ctx context.Context) (tfsdk.DataSourceT }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType: types.StringType}, + Type: types.SetType{ElemType: types.StringType}, Computed: true, }, } diff --git a/internal/aws/wafv2/logging_configuration_resource_gen.go b/internal/aws/wafv2/logging_configuration_resource_gen.go index 3349dde891..5bda5550c3 100644 --- a/internal/aws/wafv2/logging_configuration_resource_gen.go +++ b/internal/aws/wafv2/logging_configuration_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/wafv2/regex_pattern_set_resource_gen.go b/internal/aws/wafv2/regex_pattern_set_resource_gen.go index 858cda58c0..5bb5e7ea6e 100644 --- a/internal/aws/wafv2/regex_pattern_set_resource_gen.go +++ b/internal/aws/wafv2/regex_pattern_set_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/wafv2/web_acl_association_resource_gen.go b/internal/aws/wafv2/web_acl_association_resource_gen.go index 2fca627925..8113d9056e 100644 --- a/internal/aws/wafv2/web_acl_association_resource_gen.go +++ b/internal/aws/wafv2/web_acl_association_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/workspaces/connection_alias_resource_gen.go b/internal/aws/workspaces/connection_alias_resource_gen.go index a48cd13bca..2b42fa570a 100644 --- a/internal/aws/workspaces/connection_alias_resource_gen.go +++ b/internal/aws/workspaces/connection_alias_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/xray/group_resource_gen.go b/internal/aws/xray/group_resource_gen.go index d48055a01c..c884118e1d 100644 --- a/internal/aws/xray/group_resource_gen.go +++ b/internal/aws/xray/group_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/aws/xray/sampling_rule_resource_gen.go b/internal/aws/xray/sampling_rule_resource_gen.go index ba50ae733b..17f466e962 100644 --- a/internal/aws/xray/sampling_rule_resource_gen.go +++ b/internal/aws/xray/sampling_rule_resource_gen.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - "github.com/hashicorp/terraform-provider-awscc/internal/validate" ) diff --git a/internal/generic/default_value_test.go b/internal/generic/default_value_test.go index fb23186755..4434eb6126 100644 --- a/internal/generic/default_value_test.go +++ b/internal/generic/default_value_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/hashicorp/terraform-provider-awscc/internal/tfresource" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func TestDefaultValue(t *testing.T) { @@ -116,46 +115,46 @@ func TestDefaultValue(t *testing.T) { }}, }, "non-default string set": { - plannedValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + plannedValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "POST"}, }}, - currentValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + currentValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "PUT"}, }}, - defaultValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + defaultValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "GET"}, types.String{Value: "HEAD"}, }}, - expectedValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + expectedValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "POST"}, }}, }, "default string set, current out of order": { - plannedValue: providertypes.Set{ElemType: types.StringType, Null: true}, - currentValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + plannedValue: types.Set{ElemType: types.StringType, Null: true}, + currentValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "HEAD"}, types.String{Value: "GET"}, }}, - defaultValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + defaultValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "GET"}, types.String{Value: "HEAD"}, }}, - expectedValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + expectedValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "HEAD"}, types.String{Value: "GET"}, }}, }, "default string set": { - plannedValue: providertypes.Set{ElemType: types.StringType, Null: true}, - currentValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + plannedValue: types.Set{ElemType: types.StringType, Null: true}, + currentValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "GET"}, types.String{Value: "HEAD"}, }}, - defaultValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + defaultValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "GET"}, types.String{Value: "HEAD"}, }}, - expectedValue: providertypes.Set{ElemType: types.StringType, Elems: []attr.Value{ + expectedValue: types.Set{ElemType: types.StringType, Elems: []attr.Value{ types.String{Value: "GET"}, types.String{Value: "HEAD"}, }}, diff --git a/internal/generic/resource.go b/internal/generic/resource.go index bb48d53135..0976cea0de 100644 --- a/internal/generic/resource.go +++ b/internal/generic/resource.go @@ -716,6 +716,9 @@ func (r *resource) Delete(ctx context.Context, request tfsdk.DeleteResourceReque tflog.Trace(ctx, "Resource.Delete exit", "cfTypeName", cfTypeName, "tfTypeName", tfTypeName) } +func (r *resource) ImportState(ctx context.Context, request tfsdk.ImportResourceStateRequest, response *tfsdk.ImportResourceStateResponse) { +} + // ConfigValidators returns a list of functions which will all be performed during validation. func (r *resource) ConfigValidators(context.Context) []tfsdk.ResourceConfigValidator { validators := make([]tfsdk.ResourceConfigValidator, 0) diff --git a/internal/generic/state_test.go b/internal/generic/state_test.go index 5e2a345f71..2c3f52c672 100644 --- a/internal/generic/state_test.go +++ b/internal/generic/state_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-go/tftypes" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) var testSimpleSchema = tfsdk.Schema{ @@ -86,7 +85,7 @@ var testComplexSchema = tfsdk.Schema{ Required: true, }, "tags": { - Type: providertypes.SetType{ + Type: types.SetType{ ElemType: types.StringType, }, Required: true, @@ -126,7 +125,7 @@ var testComplexSchema = tfsdk.Schema{ Optional: true, }, "video_ports": { - Attributes: providertypes.SetNestedAttributes(map[string]tfsdk.Attribute{ + Attributes: tfsdk.SetNestedAttributes(map[string]tfsdk.Attribute{ "id": { Type: types.NumberType, Required: true, @@ -137,7 +136,7 @@ var testComplexSchema = tfsdk.Schema{ }, Optional: true, }, - }, providertypes.SetNestedAttributesOptions{}), + }, tfsdk.SetNestedAttributesOptions{}), Optional: true, }, "identifier": { diff --git a/internal/provider/generators/plural-data-source/main.go b/internal/provider/generators/plural-data-source/main.go index 21e391b767..25c587da75 100644 --- a/internal/provider/generators/plural-data-source/main.go +++ b/internal/provider/generators/plural-data-source/main.go @@ -138,7 +138,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func init() { @@ -156,7 +155,7 @@ func {{ .FactoryFunctionName }}(ctx context.Context) (tfsdk.DataSourceType, erro }, "ids": { Description: "Set of Resource Identifiers.", - Type: providertypes.SetType{ElemType:types.StringType}, + Type: types.SetType{ElemType:types.StringType}, Computed: true, }, } diff --git a/internal/provider/generators/resource/main.go b/internal/provider/generators/resource/main.go index 160e3052b5..a8aef6d2a9 100644 --- a/internal/provider/generators/resource/main.go +++ b/internal/provider/generators/resource/main.go @@ -120,7 +120,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - {{ if .ImportInternalTypes }}providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types"{{- end }} {{ if .ImportValidate }}"github.com/hashicorp/terraform-provider-awscc/internal/validate"{{- end }} ) diff --git a/internal/provider/generators/shared/codegen/emitter.go b/internal/provider/generators/shared/codegen/emitter.go index e561d85196..0a437c7613 100644 --- a/internal/provider/generators/shared/codegen/emitter.go +++ b/internal/provider/generators/shared/codegen/emitter.go @@ -17,7 +17,6 @@ type Features int const ( HasUpdatableProperty Features = 1 << iota // At least one property can be updated. - UsesInternalTypes // Uses a type from the internal/types package. HasRequiredRootProperty // At least one root property is required. UsesFrameworkAttr // Uses a type from the terraform-plugin-framework/attr package. UsesMathBig // Uses a type from the math/big package. @@ -226,18 +225,14 @@ func (e Emitter) emitAttribute(attributeNameMap map[string]string, path []string // Set. // switch itemType := property.Items.Type.String(); itemType { - // Sets of primitive types use provider-local Set type until tfsdk support is available. case cfschema.PropertyTypeBoolean: - features |= UsesInternalTypes - e.printf("Type:providertypes.SetType{ElemType:types.BoolType},\n") + e.printf("Type:types.SetType{ElemType:types.BoolType},\n") case cfschema.PropertyTypeInteger, cfschema.PropertyTypeNumber: - features |= UsesInternalTypes - e.printf("Type:providertypes.SetType{ElemType:types.NumberType},\n") + e.printf("Type:types.SetType{ElemType:types.NumberType},\n") case cfschema.PropertyTypeString: - features |= UsesInternalTypes - e.printf("Type:providertypes.SetType{ElemType:types.StringType},\n") + e.printf("Type:types.SetType{ElemType:types.StringType},\n") case cfschema.PropertyTypeObject: if len(property.Items.PatternProperties) > 0 { @@ -248,8 +243,7 @@ func (e Emitter) emitAttribute(attributeNameMap map[string]string, path []string return 0, unsupportedTypeError(path, "set of undefined schema") } - features |= UsesInternalTypes - e.printf("Attributes:providertypes.SetNestedAttributes(\n") + e.printf("Attributes:tfsdk.SetNestedAttributes(\n") f, err := e.emitSchema( attributeNameMap, @@ -267,7 +261,7 @@ func (e Emitter) emitAttribute(attributeNameMap map[string]string, path []string features |= f e.printf(",\n") - e.printf("providertypes.SetNestedAttributesOptions{\n") + e.printf("tfsdk.SetNestedAttributesOptions{\n") if !computedOnly { if property.MinItems != nil { @@ -423,18 +417,14 @@ func (e Emitter) emitAttribute(attributeNameMap map[string]string, path []string case cfschema.PropertyTypeArray: if aggregateType(patternProperty) == aggregateSet { switch itemType := patternProperty.Items.Type.String(); itemType { - // Sets of primitive types use provider-local Set type until tfsdk support is available. case cfschema.PropertyTypeBoolean: - features |= UsesInternalTypes - e.printf("Type: types.MapType{ElemType:providertypes.SetType{ElemType:types.BoolType}},\n") + e.printf("Type: types.MapType{ElemType:types.SetType{ElemType:types.BoolType}},\n") case cfschema.PropertyTypeInteger, cfschema.PropertyTypeNumber: - features |= UsesInternalTypes - e.printf("Type: types.MapType{ElemType:providertypes.SetType{ElemType:types.NumberType}},\n") + e.printf("Type: types.MapType{ElemType:types.SetType{ElemType:types.NumberType}},\n") case cfschema.PropertyTypeString: - features |= UsesInternalTypes - e.printf("Type: types.MapType{ElemType:providertypes.SetType{ElemType:types.StringType}},\n") + e.printf("Type: types.MapType{ElemType:types.SetType{ElemType:types.StringType}},\n") default: return 0, unsupportedTypeError(path, fmt.Sprintf("key-value map of set of %s", itemType)) @@ -788,11 +778,10 @@ func defaultValueAttributePlanModifier(path []string, property *cfschema.Propert case aggregateNone: return 0, "", fmt.Errorf("%s has invalid default value type: %T", strings.Join(path, "/"), v) case aggregateSet: - features |= UsesInternalTypes features |= UsesFrameworkAttr w := &strings.Builder{} - fprintf(w, "DefaultValue(providertypes.Set{ElemType:types.StringType, Elems: []attr.Value{\n") + fprintf(w, "DefaultValue(types.Set{ElemType:types.StringType, Elems: []attr.Value{\n") for _, elem := range v { switch v := elem.(type) { case string: diff --git a/internal/provider/generators/shared/generator.go b/internal/provider/generators/shared/generator.go index 6c88d05972..2523af477a 100644 --- a/internal/provider/generators/shared/generator.go +++ b/internal/provider/generators/shared/generator.go @@ -128,9 +128,6 @@ func (g *Generator) GenerateTemplateData(cfTypeSchemaFile, resType, tfResourceTy if codeFeatures&codegen.UsesFrameworkAttr > 0 { templateData.ImportFrameworkAttr = true } - if codeFeatures&codegen.UsesInternalTypes > 0 { - templateData.ImportInternalTypes = true - } if codeFeatures&codegen.UsesMathBig > 0 { templateData.ImportMathBig = true } @@ -190,7 +187,6 @@ type TemplateData struct { HasRequiredAttribute bool HasUpdateMethod bool ImportFrameworkAttr bool - ImportInternalTypes bool ImportMathBig bool ImportValidate bool PackageName string diff --git a/internal/provider/generators/singular-data-source/main.go b/internal/provider/generators/singular-data-source/main.go index 26a953e989..93b44d644b 100644 --- a/internal/provider/generators/singular-data-source/main.go +++ b/internal/provider/generators/singular-data-source/main.go @@ -118,7 +118,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" . "github.com/hashicorp/terraform-provider-awscc/internal/generic" "github.com/hashicorp/terraform-provider-awscc/internal/registry" - {{ if .ImportInternalTypes }}providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types"{{- end }} ) func init() { diff --git a/internal/types/set.go b/internal/types/set.go deleted file mode 100644 index 06f456b922..0000000000 --- a/internal/types/set.go +++ /dev/null @@ -1,179 +0,0 @@ -package types - -import ( - "context" - "fmt" - - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-go/tftypes" -) - -// SetType is an AttributeType representing a list of values. -// All values must be of the same type, which the provider must specify as the ElemType property. -// Implements attr.Type. -type SetType struct { - ElemType attr.Type -} - -// ElementType returns the attr.Type elements will be created from. -func (s SetType) ElementType() attr.Type { - return s.ElemType -} - -// TerraformType returns the tftypes.Type that should be used to -// represent this type. This constrains what user input will be -// accepted and what kind of data can be set in state. The framework -// will use this to translate the Type to something Terraform can -// understand. -func (s SetType) TerraformType(ctx context.Context) tftypes.Type { - return tftypes.Set{ - ElementType: s.ElemType.TerraformType(ctx), - } -} - -// ValueFromTerraform returns a Value given a tftypes.Value. This is -// meant to convert the tftypes.Value into a more convenient Go type -// for the provider to consume the data with. -func (s SetType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) { - if !in.Type().Is(s.TerraformType(ctx)) { - return nil, fmt.Errorf("can't use %s as value of Set with ElementType %T, can only use %s values", in.String(), s.ElemType, s.ElemType.TerraformType(ctx).String()) - } - set := Set{ - ElemType: s.ElemType, - } - if !in.IsKnown() { - set.Unknown = true - return set, nil - } - if in.IsNull() { - set.Null = true - return set, nil - } - val := []tftypes.Value{} - err := in.As(&val) - if err != nil { - return nil, err - } - elems := make([]attr.Value, 0, len(val)) - for _, elem := range val { - av, err := s.ElemType.ValueFromTerraform(ctx, elem) - if err != nil { - return nil, err - } - elems = append(elems, av) - } - set.Elems = elems - return set, nil -} - -// Equal must return true if the Type is considered semantically equal -// to the Type passed as an argument. -func (s SetType) Equal(o attr.Type) bool { - if s.ElemType == nil { - return false - } - other, ok := o.(SetType) - if !ok { - return false - } - return s.ElemType.Equal(other.ElemType) -} - -// Return the attribute or element the AttributePathStep is referring -// to, or an error if the AttributePathStep is referring to an -// attribute or element that doesn't exist. -func (s SetType) ApplyTerraform5AttributePathStep(step tftypes.AttributePathStep) (interface{}, error) { - if _, ok := step.(tftypes.ElementKeyValue); !ok { - return nil, fmt.Errorf("cannot apply step %T to ListType", step) - } - - return s.ElemType, nil -} - -// Set represents a set of AttributeValues, all of the same type, indicated -// by ElemType. -type Set struct { - // Unknown will be set to true if the entire set is an unknown value. - // If only some of the members of the set are unknown, their known or - // unknown status will be represented however that AttributeValue - // surfaces that information. The Set's Unknown property only tracks - // if the number of elements in a Set is known, not whether the - // members of the set are known. - Unknown bool - - // Null will be set to true if the set is null, either because it was - // omitted from the configuration, state, or plan, or because it was - // explicitly set to null. - Null bool - - // Elems are the members of the set. - Elems []attr.Value - - // ElemType is the tftypes.Type of the members of the set. All - // members of the set must be of this type. - ElemType attr.Type -} - -// ToTerraformValue returns the data contained in the AttributeValue as -// a Go type that tftypes.NewValue will accept. -func (s Set) ToTerraformValue(ctx context.Context) (interface{}, error) { - if s.Unknown { - return tftypes.UnknownValue, nil - } - if s.Null { - return nil, nil - } - vals := make([]tftypes.Value, 0, len(s.Elems)) - for _, elem := range s.Elems { - val, err := elem.ToTerraformValue(ctx) - if err != nil { - return nil, err - } - err = tftypes.ValidateValue(s.ElemType.TerraformType(ctx), val) - if err != nil { - return nil, fmt.Errorf("error validating terraform type: %w", err) - } - vals = append(vals, tftypes.NewValue(s.ElemType.TerraformType(ctx), val)) - } - return vals, nil -} - -// Equal must return true if the AttributeValue is considered -// semantically equal to the AttributeValue passed as an argument. -func (s Set) Equal(o attr.Value) bool { - other, ok := o.(Set) - if !ok { - return false - } - if s.Unknown != other.Unknown { - return false - } - if s.Null != other.Null { - return false - } - if !s.ElemType.Equal(other.ElemType) { - return false - } - if len(s.Elems) != len(other.Elems) { - return false - } - // Element order is not significant in Sets. - for _, sElem := range s.Elems { - found := false - for _, oElem := range other.Elems { - if sElem.Equal(oElem) { - found = true - break - } - } - if !found { - return false - } - } - return true -} - -// Type returns the Type that created the Value. -func (s Set) Type(ctx context.Context) attr.Type { - return SetType{ElemType: s.ElemType} -} diff --git a/internal/types/set_nested_attributes.go b/internal/types/set_nested_attributes.go deleted file mode 100644 index 7ac6834163..0000000000 --- a/internal/types/set_nested_attributes.go +++ /dev/null @@ -1,127 +0,0 @@ -package types - -import ( - "fmt" - - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-framework/tfsdk" - "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-go/tftypes" -) - -type nestedAttributes map[string]tfsdk.Attribute - -func (n nestedAttributes) GetAttributes() map[string]tfsdk.Attribute { - return map[string]tfsdk.Attribute(n) -} - -func (n nestedAttributes) ApplyTerraform5AttributePathStep(step tftypes.AttributePathStep) (interface{}, error) { - a, ok := step.(tftypes.AttributeName) - if !ok { - return nil, fmt.Errorf("can't apply %T to Attributes", step) - } - res, ok := n[string(a)] - if !ok { - return nil, fmt.Errorf("no attribute %q on Attributes", a) - } - return res, nil -} - -// AttributeType returns an attr.Type corresponding to the nested attributes. -func (n nestedAttributes) AttributeType() attr.Type { - attrTypes := map[string]attr.Type{} - for name, attr := range n.GetAttributes() { - if attr.Type != nil { - attrTypes[name] = attr.Type - } - if attr.Attributes != nil { - attrTypes[name] = attr.Attributes.AttributeType() - } - } - return types.ObjectType{ - AttrTypes: attrTypes, - } -} - -// SetNestedAttributes nests `attributes` under another attribute, allowing -// multiple instances of that group of attributes to appear in the -// configuration, while requiring each group of values be unique. Minimum and -// maximum numbers of times the group can appear in the configuration can be -// set using `opts`. -func SetNestedAttributes(attributes map[string]tfsdk.Attribute, opts SetNestedAttributesOptions) tfsdk.NestedAttributes { - return setNestedAttributes{ - nestedAttributes: nestedAttributes(attributes), - min: opts.MinItems, - max: opts.MaxItems, - } -} - -type setNestedAttributes struct { - nestedAttributes - - min, max int -} - -// SetNestedAttributesOptions captures additional, optional parameters for -// SetNestedAttributes. -type SetNestedAttributesOptions struct { - MinItems int - MaxItems int -} - -func (s setNestedAttributes) GetNestingMode() tfsdk.NestingMode { - return tfsdk.NestingModeSet -} - -func (s setNestedAttributes) GetAttributes() map[string]tfsdk.Attribute { - return s.nestedAttributes -} - -func (s setNestedAttributes) GetMinItems() int64 { - return int64(s.min) -} - -func (s setNestedAttributes) GetMaxItems() int64 { - return int64(s.max) -} - -// AttributeType returns an attr.Type corresponding to the nested attributes. -func (s setNestedAttributes) AttributeType() attr.Type { - return SetType{ - ElemType: s.nestedAttributes.AttributeType(), - } -} - -func (s setNestedAttributes) ApplyTerraform5AttributePathStep(step tftypes.AttributePathStep) (interface{}, error) { - _, ok := step.(tftypes.ElementKeyValue) - if !ok { - return nil, fmt.Errorf("can't apply %T to SetNestedAttributes", step) - } - return s.nestedAttributes, nil -} - -func (s setNestedAttributes) Equal(o tfsdk.NestedAttributes) bool { - other, ok := o.(setNestedAttributes) - if !ok { - return false - } - if s.min != other.min { - return false - } - if s.max != other.max { - return false - } - if len(other.nestedAttributes) != len(s.nestedAttributes) { - return false - } - for k, v := range s.nestedAttributes { - otherV, ok := other.nestedAttributes[k] - if !ok { - return false - } - if !v.Equal(otherV) { - return false - } - } - return true -} diff --git a/internal/types/set_test.go b/internal/types/set_test.go deleted file mode 100644 index 2a039d5d3f..0000000000 --- a/internal/types/set_test.go +++ /dev/null @@ -1,617 +0,0 @@ -package types - -import ( - "context" - "testing" - - "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-go/tftypes" -) - -func TestSetTypeTerraformType(t *testing.T) { - t.Parallel() - - type testCase struct { - input SetType - expected tftypes.Type - } - tests := map[string]testCase{ - "set-of-strings": { - input: SetType{ - ElemType: types.StringType, - }, - expected: tftypes.Set{ - ElementType: tftypes.String, - }, - }, - "set-of-set-of-bools": { - input: SetType{ - ElemType: SetType{ - ElemType: types.BoolType, - }, - }, - expected: tftypes.Set{ - ElementType: tftypes.Set{ - ElementType: tftypes.Bool, - }, - }, - }, - "set-of-set-of-list-of-number": { - input: SetType{ - ElemType: SetType{ - ElemType: types.ListType{ - ElemType: types.NumberType, - }, - }, - }, - expected: tftypes.Set{ - ElementType: tftypes.Set{ - ElementType: tftypes.List{ - ElementType: tftypes.Number, - }, - }, - }, - }, - } - for name, test := range tests { - name, test := name, test - t.Run(name, func(t *testing.T) { - got := test.input.TerraformType(context.Background()) - if !got.Is(test.expected) { - t.Errorf("Expected %s, got %s", test.expected, got) - } - }) - } -} - -func TestSetTypeValueFromTerraform(t *testing.T) { - t.Parallel() - - type testCase struct { - receiver SetType - input tftypes.Value - expected attr.Value - expectedErr string - } - tests := map[string]testCase{ - "set-of-strings": { - receiver: SetType{ - ElemType: types.StringType, - }, - input: tftypes.NewValue(tftypes.Set{ - ElementType: tftypes.String, - }, []tftypes.Value{ - tftypes.NewValue(tftypes.String, "hello"), - tftypes.NewValue(tftypes.String, "world"), - }), - expected: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - }, - "unknown-set": { - receiver: SetType{ - ElemType: types.StringType, - }, - input: tftypes.NewValue(tftypes.Set{ - ElementType: tftypes.String, - }, tftypes.UnknownValue), - expected: Set{ - ElemType: types.StringType, - Unknown: true, - }, - }, - "partially-unknown-set": { - receiver: SetType{ - ElemType: types.StringType, - }, - input: tftypes.NewValue(tftypes.Set{ - ElementType: tftypes.String, - }, []tftypes.Value{ - tftypes.NewValue(tftypes.String, "hello"), - tftypes.NewValue(tftypes.String, tftypes.UnknownValue), - }), - expected: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - }, - "null-set": { - receiver: SetType{ - ElemType: types.StringType, - }, - input: tftypes.NewValue(tftypes.Set{ - ElementType: tftypes.String, - }, nil), - expected: Set{ - ElemType: types.StringType, - Null: true, - }, - }, - "partially-null-set": { - receiver: SetType{ - ElemType: types.StringType, - }, - input: tftypes.NewValue(tftypes.Set{ - ElementType: tftypes.String, - }, []tftypes.Value{ - tftypes.NewValue(tftypes.String, "hello"), - tftypes.NewValue(tftypes.String, nil), - }), - expected: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - }, - } - for name, test := range tests { - name, test := name, test - t.Run(name, func(t *testing.T) { - got, gotErr := test.receiver.ValueFromTerraform(context.Background(), test.input) - if gotErr != nil { - if test.expectedErr != "" { - if gotErr.Error() != test.expectedErr { - t.Errorf("Expected error to be %q, got %q", test.expectedErr, gotErr.Error()) - return - } - } - t.Errorf("Unexpected error: %s", gotErr.Error()) - return - } - if gotErr == nil && test.expectedErr != "" { - t.Errorf("Expected error to be %q, got nil", test.expectedErr) - return - } - if diff := cmp.Diff(got, test.expected); diff != "" { - t.Errorf("Unexpected diff (-expected, +got): %s", diff) - } - }) - } -} - -func TestSetTypeEqual(t *testing.T) { - t.Parallel() - - type testCase struct { - receiver SetType - input attr.Type - expected bool - } - tests := map[string]testCase{ - "equal": { - receiver: SetType{ElemType: types.StringType}, - input: SetType{ElemType: types.StringType}, - expected: true, - }, - "diff": { - receiver: SetType{ElemType: types.StringType}, - input: SetType{ElemType: types.NumberType}, - expected: false, - }, - "wrongType": { - receiver: SetType{ElemType: types.StringType}, - input: types.NumberType, - expected: false, - }, - "nil": { - receiver: SetType{ElemType: types.StringType}, - input: nil, - expected: false, - }, - "nil-elem": { - receiver: SetType{}, - input: SetType{}, - // SetTypes with nil ElemTypes are invalid, and - // aren't equal to anything - expected: false, - }, - } - for name, test := range tests { - name, test := name, test - t.Run(name, func(t *testing.T) { - t.Parallel() - - got := test.receiver.Equal(test.input) - if test.expected != got { - t.Errorf("Expected %v, got %v", test.expected, got) - } - }) - } -} - -func TestSetToTerraformValue(t *testing.T) { - t.Parallel() - - type testCase struct { - input Set - expectation interface{} - } - tests := map[string]testCase{ - "value": { - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - expectation: []tftypes.Value{ - tftypes.NewValue(tftypes.String, "hello"), - tftypes.NewValue(tftypes.String, "world"), - }, - }, - "unknown": { - input: Set{Unknown: true}, - expectation: tftypes.UnknownValue, - }, - "null": { - input: Set{Null: true}, - expectation: nil, - }, - "partial-unknown": { - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Unknown: true}, - types.String{Value: "hello, world"}, - }, - }, - expectation: []tftypes.Value{ - tftypes.NewValue(tftypes.String, tftypes.UnknownValue), - tftypes.NewValue(tftypes.String, "hello, world"), - }, - }, - "partial-null": { - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Null: true}, - types.String{Value: "hello, world"}, - }, - }, - expectation: []tftypes.Value{ - tftypes.NewValue(tftypes.String, nil), - tftypes.NewValue(tftypes.String, "hello, world"), - }, - }, - } - for name, test := range tests { - name, test := name, test - t.Run(name, func(t *testing.T) { - t.Parallel() - - got, err := test.input.ToTerraformValue(context.Background()) - if err != nil { - t.Errorf("Unexpected error: %s", err) - return - } - if diff := cmp.Diff(got, test.expectation); diff != "" { - t.Errorf("Unexpected result (+got, -expected): %s", diff) - } - }) - } -} - -func TestSetEqual(t *testing.T) { - t.Parallel() - - type testCase struct { - receiver Set - input attr.Value - expected bool - } - tests := map[string]testCase{ - "set-value-set-value": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - expected: true, - }, - "set-value-diff": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "goodnight"}, - types.String{Value: "moon"}, - }, - }, - expected: false, - }, - "set-value-diff-order": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "world"}, - types.String{Value: "hello"}, - }, - }, - expected: true, - }, - "set-value-count-diff": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - types.String{Value: "test"}, - }, - }, - expected: false, - }, - "set-value-type-diff": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: Set{ - ElemType: types.BoolType, - Elems: []attr.Value{ - types.Bool{Value: false}, - types.Bool{Value: true}, - }, - }, - expected: false, - }, - "set-value-unknown": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: Set{Unknown: true}, - expected: false, - }, - "set-value-null": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: Set{Null: true}, - expected: false, - }, - "set-value-wrongType": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: types.String{Value: "hello, world"}, - expected: false, - }, - "set-value-nil": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - input: nil, - expected: false, - }, - "partially-known-set-value-set-value": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - expected: true, - }, - "partially-known-set-value-diff": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - expected: false, - }, - "partially-known-set-value-unknown": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - input: Set{Unknown: true}, - expected: false, - }, - "partially-known-set-value-null": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - input: Set{Null: true}, - expected: false, - }, - "partially-known-set-value-wrongType": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - input: types.String{Value: "hello, world"}, - expected: false, - }, - "partially-known-set-value-nil": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Unknown: true}, - }, - }, - input: nil, - expected: false, - }, - "partially-null-set-value-set-value": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - expected: true, - }, - "partially-null-set-value-diff": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - input: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Value: "world"}, - }, - }, - expected: false, - }, - "partially-null-set-value-unknown": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - input: Set{ - Unknown: true, - }, - expected: false, - }, - "partially-null-set-value-null": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - input: Set{ - Null: true, - }, - expected: false, - }, - "partially-null-set-value-wrongType": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - input: types.String{Value: "hello, world"}, - expected: false, - }, - "partially-null-set-value-nil": { - receiver: Set{ - ElemType: types.StringType, - Elems: []attr.Value{ - types.String{Value: "hello"}, - types.String{Null: true}, - }, - }, - input: nil, - expected: false, - }, - } - for name, test := range tests { - name, test := name, test - t.Run(name, func(t *testing.T) { - t.Parallel() - - got := test.receiver.Equal(test.input) - if got != test.expected { - t.Errorf("Expected %v, got %v", test.expected, got) - } - }) - } -} diff --git a/internal/validate/array.go b/internal/validate/array.go index 71f2c144ce..8d2bbdf699 100644 --- a/internal/validate/array.go +++ b/internal/validate/array.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) // arrayLenBetweenValidator validates that an array (List/Set) Attribute's length is in a range. @@ -37,7 +36,7 @@ func (validator arrayLenBetweenValidator) Validate(ctx context.Context, request l = len(v.Elems) - case providertypes.Set: + case types.Set: if v.Null || v.Unknown { return } @@ -105,7 +104,7 @@ func (validator arrayLenAtLeastValidator) Validate(ctx context.Context, request l = len(v.Elems) - case providertypes.Set: + case types.Set: if v.Null || v.Unknown { return } diff --git a/internal/validate/array_test.go b/internal/validate/array_test.go index 5a9e843a0f..3be2ea0091 100644 --- a/internal/validate/array_test.go +++ b/internal/validate/array_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/hashicorp/terraform-provider-awscc/internal/tfresource" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func TestArrayLenBetweenValidator(t *testing.T) { @@ -77,25 +76,25 @@ func TestArrayLenBetweenValidator(t *testing.T) { }, "unknown set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, tftypes.UnknownValue), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 0, maxItems: 3, }, "null set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, nil), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 0, maxItems: 3, }, "valid empty set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, []tftypes.Value{}), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 0, maxItems: 3, }, "invalid empty set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, []tftypes.Value{}), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 1, maxItems: 3, expectError: true, @@ -106,7 +105,7 @@ func TestArrayLenBetweenValidator(t *testing.T) { tftypes.NewValue(tftypes.String, "beta"), tftypes.NewValue(tftypes.String, "gamma"), }), - f: providertypes.SetType{ElemType: types.StringType}.ValueFromTerraform, + f: types.SetType{ElemType: types.StringType}.ValueFromTerraform, minItems: 2, maxItems: 3, }, @@ -117,7 +116,7 @@ func TestArrayLenBetweenValidator(t *testing.T) { tftypes.NewValue(tftypes.String, "gamma"), tftypes.NewValue(tftypes.String, "delta"), }), - f: providertypes.SetType{ElemType: types.StringType}.ValueFromTerraform, + f: types.SetType{ElemType: types.StringType}.ValueFromTerraform, minItems: 2, maxItems: 3, expectError: true, @@ -207,22 +206,22 @@ func TestArrayLenAtLeastValidator(t *testing.T) { }, "unknown set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, tftypes.UnknownValue), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 0, }, "null set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, nil), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 0, }, "valid empty set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, []tftypes.Value{}), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 0, }, "invalid empty set": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.Number}, []tftypes.Value{}), - f: providertypes.SetType{ElemType: types.NumberType}.ValueFromTerraform, + f: types.SetType{ElemType: types.NumberType}.ValueFromTerraform, minItems: 1, expectError: true, }, @@ -232,14 +231,14 @@ func TestArrayLenAtLeastValidator(t *testing.T) { tftypes.NewValue(tftypes.String, "beta"), tftypes.NewValue(tftypes.String, "gamma"), }), - f: providertypes.SetType{ElemType: types.StringType}.ValueFromTerraform, + f: types.SetType{ElemType: types.StringType}.ValueFromTerraform, minItems: 2, }, "invalid set of string": { val: tftypes.NewValue(tftypes.Set{ElementType: tftypes.String}, []tftypes.Value{ tftypes.NewValue(tftypes.String, "alpha"), }), - f: providertypes.SetType{ElemType: types.StringType}.ValueFromTerraform, + f: types.SetType{ElemType: types.StringType}.ValueFromTerraform, minItems: 2, expectError: true, }, diff --git a/internal/validate/required.go b/internal/validate/required.go index 624ad1bd99..a5f3ce0d0c 100644 --- a/internal/validate/required.go +++ b/internal/validate/required.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-go/tftypes" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) type RequiredAttributesFunc func(names []string) tfdiag.Diagnostics @@ -140,7 +139,7 @@ func (validator requiredAttributesValidator) Validate(ctx context.Context, reque return } - case providertypes.Set: + case types.Set: if v.Null || v.Unknown { return } diff --git a/internal/validate/required_test.go b/internal/validate/required_test.go index f92dfa4c84..98eb784905 100644 --- a/internal/validate/required_test.go +++ b/internal/validate/required_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/hashicorp/terraform-provider-awscc/internal/tfresource" - providertypes "github.com/hashicorp/terraform-provider-awscc/internal/types" ) func TestRequired(t *testing.T) { @@ -558,21 +557,21 @@ func TestRequiredAttributesValidator_Set(t *testing.T) { tftypes.Set{ElementType: objectElementType}, tftypes.UnknownValue, ), - f: providertypes.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, + f: types.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, }, "null set": { val: tftypes.NewValue( tftypes.Set{ElementType: objectElementType}, nil, ), - f: providertypes.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, + f: types.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, }, "empty set": { val: tftypes.NewValue( tftypes.Set{ElementType: objectElementType}, []tftypes.Value{}, ), - f: providertypes.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, + f: types.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, }, "not fully known object": { val: tftypes.NewValue( @@ -592,7 +591,7 @@ func TestRequiredAttributesValidator_Set(t *testing.T) { }), }, ), - f: providertypes.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, + f: types.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, }, "none required": { val: tftypes.NewValue( @@ -612,7 +611,7 @@ func TestRequiredAttributesValidator_Set(t *testing.T) { }), }, ), - f: providertypes.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, + f: types.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, }, "one required OK": { val: tftypes.NewValue( @@ -632,7 +631,7 @@ func TestRequiredAttributesValidator_Set(t *testing.T) { }), }, ), - f: providertypes.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, + f: types.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, fs: []RequiredAttributesFunc{Required("alpha")}, }, "one required error": { @@ -653,7 +652,7 @@ func TestRequiredAttributesValidator_Set(t *testing.T) { }), }, ), - f: providertypes.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, + f: types.SetType{ElemType: objectElementAttrType}.ValueFromTerraform, fs: []RequiredAttributesFunc{Required("beta")}, expectError: true, }, diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/attr/type.go b/vendor/github.com/hashicorp/terraform-plugin-framework/attr/type.go index 5a74c49623..939beb442b 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/attr/type.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/attr/type.go @@ -27,6 +27,9 @@ type Type interface { // to the Type passed as an argument. Equal(Type) bool + // String should return a human-friendly version of the Type. + String() string + tftypes.AttributePathStepper } diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/internal/reflect/slice.go b/vendor/github.com/hashicorp/terraform-plugin-framework/internal/reflect/slice.go index 097e6c46d3..314b896ada 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/internal/reflect/slice.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/internal/reflect/slice.go @@ -65,10 +65,14 @@ func reflectSlice(ctx context.Context, typ attr.Type, val tftypes.Value, target targetValue := reflect.Zero(elemType) // update our path so we can have nice errors - path := path.WithElementKeyInt(int64(pos)) + valPath := path.WithElementKeyInt(int64(pos)) + + if typ.TerraformType(ctx).Is(tftypes.Set{}) { + valPath = path.WithElementKeyValue(value) + } // reflect the value into our new target - val, valDiags := BuildValue(ctx, elemAttrType, value, targetValue, opts, path) + val, valDiags := BuildValue(ctx, elemAttrType, value, targetValue, opts, valPath) diags.Append(valDiags...) if diags.HasError() { @@ -135,25 +139,40 @@ func FromSlice(ctx context.Context, typ attr.Type, val reflect.Value, path *tfty elemType := t.ElementType() tfElems := make([]tftypes.Value, 0, val.Len()) for i := 0; i < val.Len(); i++ { - val, valDiags := FromValue(ctx, elemType, val.Index(i).Interface(), path.WithElementKeyInt(int64(i))) + // The underlying reflect.Slice is fetched by Index(). For set types, + // the path is value-based instead of index-based. Since there is only + // the index until the value is retrieved, this will pass the + // technically incorrect index-based path at first for framework + // debugging purposes, then correct the path afterwards. + valPath := path.WithElementKeyInt(int64(i)) + + val, valDiags := FromValue(ctx, elemType, val.Index(i).Interface(), valPath) diags.Append(valDiags...) if diags.HasError() { return nil, diags } + tfVal, err := val.ToTerraformValue(ctx) + if err != nil { return nil, append(diags, toTerraformValueErrorDiag(err, path)) } + err = tftypes.ValidateValue(elemType.TerraformType(ctx), tfVal) + if err != nil { return nil, append(diags, validateValueErrorDiag(err, path)) } tfElemVal := tftypes.NewValue(elemType.TerraformType(ctx), tfVal) - if typeWithValidate, ok := typ.(attr.TypeWithValidate); ok { - diags.Append(typeWithValidate.Validate(ctx, tfElemVal, path.WithElementKeyInt(int64(i)))...) + if tfType.Is(tftypes.Set{}) { + valPath = path.WithElementKeyValue(tfElemVal) + } + + if typeWithValidate, ok := elemType.(attr.TypeWithValidate); ok { + diags.Append(typeWithValidate.Validate(ctx, tfElemVal, valPath)...) if diags.HasError() { return nil, diags diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/attribute.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/attribute.go index 55c1770c4d..93eb0629e7 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/attribute.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/attribute.go @@ -309,8 +309,49 @@ func (a Attribute) validate(ctx context.Context, req ValidateAttributeRequest, r } } case NestingModeSet: - // TODO: Set implementation - // Reference: https://github.com/hashicorp/terraform-plugin-framework/issues/53 + s, ok := req.AttributeConfig.(types.Set) + + if !ok { + err := fmt.Errorf("unknown attribute value type (%T) for nesting mode (%T) at path: %s", req.AttributeConfig, nm, req.AttributePath) + resp.Diagnostics.AddAttributeError( + req.AttributePath, + "Attribute Validation Error", + "Attribute validation cannot walk schema. Report this to the provider developer:\n\n"+err.Error(), + ) + + return + } + + for _, value := range s.Elems { + tfValueRaw, err := value.ToTerraformValue(ctx) + + if err != nil { + err := fmt.Errorf("error running ToTerraformValue on element value: %v", value) + resp.Diagnostics.AddAttributeError( + req.AttributePath, + "Attribute Validation Error", + "Attribute validation cannot convert element into a Terraform value. Report this to the provider developer:\n\n"+err.Error(), + ) + + return + } + + tfValue := tftypes.NewValue(s.ElemType.TerraformType(ctx), tfValueRaw) + + for nestedName, nestedAttr := range a.Attributes.GetAttributes() { + nestedAttrReq := ValidateAttributeRequest{ + AttributePath: req.AttributePath.WithElementKeyValue(tfValue).WithAttributeName(nestedName), + Config: req.Config, + } + nestedAttrResp := &ValidateAttributeResponse{ + Diagnostics: resp.Diagnostics, + } + + nestedAttr.validate(ctx, nestedAttrReq, nestedAttrResp) + + resp.Diagnostics = nestedAttrResp.Diagnostics + } + } case NestingModeMap: m, ok := req.AttributeConfig.(types.Map) diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/convert.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/convert.go new file mode 100644 index 0000000000..bce68e12ee --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/convert.go @@ -0,0 +1,37 @@ +package tfsdk + +import ( + "context" + "fmt" + + "github.com/hashicorp/terraform-plugin-framework/attr" + "github.com/hashicorp/terraform-plugin-framework/diag" + "github.com/hashicorp/terraform-plugin-go/tftypes" +) + +// ConvertValue creates a new attr.Value of the attr.Type `typ`, using the data +// in `val`, which can be of any attr.Type so long as its TerraformType method +// returns a tftypes.Type that `typ`'s ValueFromTerraform method can accept. +func ConvertValue(ctx context.Context, val attr.Value, typ attr.Type) (attr.Value, diag.Diagnostics) { + tftype := typ.TerraformType(ctx) + tfval, err := val.ToTerraformValue(ctx) + if err != nil { + return nil, diag.Diagnostics{diag.NewErrorDiagnostic("Error converting value", + fmt.Sprintf("An unexpected error was encountered converting a %T to a %s. This is always a problem with the provider. Please tell the provider developers that %T ran into the following error during ToTerraformValue: %s", val, typ, val, err), + )} + } + err = tftypes.ValidateValue(tftype, tfval) + if err != nil { + return nil, diag.Diagnostics{diag.NewErrorDiagnostic("Error converting value", + fmt.Sprintf("An unexpected error was encountered converting a %T to a %s. This is always a problem with the provider. Please tell the provider developers that %T is not compatible with %s.", val, typ, val, typ), + )} + } + newVal := tftypes.NewValue(tftype, tfval) + res, err := typ.ValueFromTerraform(ctx, newVal) + if err != nil { + return nil, diag.Diagnostics{diag.NewErrorDiagnostic("Error converting value", + fmt.Sprintf("An unexpected error was encountered converting a %T to a %s. This is always a problem with the provider. Please tell the provider developers that %s returned the following error when calling ValueFromTerraform: %s", val, typ, typ, err), + )} + } + return res, nil +} diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/nested_attributes.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/nested_attributes.go index 05f3db7874..403cbbfb1f 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/nested_attributes.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/nested_attributes.go @@ -69,8 +69,7 @@ type NestedAttributes interface { GetMinItems() int64 GetMaxItems() int64 Equal(NestedAttributes) bool - // TODO Commented out: - //unimplementable() + unimplementable() } type nestedAttributes map[string]Attribute @@ -79,8 +78,7 @@ func (n nestedAttributes) GetAttributes() map[string]Attribute { return map[string]Attribute(n) } -// TODO Commented out: -//func (n nestedAttributes) unimplementable() {} +func (n nestedAttributes) unimplementable() {} func (n nestedAttributes) ApplyTerraform5AttributePathStep(step tftypes.AttributePathStep) (interface{}, error) { a, ok := step.(tftypes.AttributeName) @@ -273,8 +271,9 @@ func (s setNestedAttributes) GetMaxItems() int64 { // AttributeType returns an attr.Type corresponding to the nested attributes. func (s setNestedAttributes) AttributeType() attr.Type { - // TODO fill in implementation when types.SetType is available - return nil + return types.SetType{ + ElemType: s.nestedAttributes.AttributeType(), + } } func (s setNestedAttributes) ApplyTerraform5AttributePathStep(step tftypes.AttributePathStep) (interface{}, error) { diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/request_import.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/request_import.go new file mode 100644 index 0000000000..34196fa23e --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/request_import.go @@ -0,0 +1,14 @@ +package tfsdk + +// ImportResourceStateRequest represents a request for the provider to import a +// resource. An instance of this request struct is supplied as an argument to +// the Resource's ImportState method. +type ImportResourceStateRequest struct { + // ID represents the import identifier supplied by the practitioner when + // calling the import command. In many cases, this may align with the + // unique identifier for the resource, which can optionally be stored + // as an Attribute. However, this identifier can also be treated as + // its own type of value and parsed during import. This value + // is not stored in the state unless the provider explicitly stores it. + ID string +} diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/resource.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/resource.go index 3844f9808e..476980617f 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/resource.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/resource.go @@ -41,6 +41,15 @@ type Resource interface { // Delete is called when the provider must delete the resource. Config // values may be read from the DeleteResourceRequest. Delete(context.Context, DeleteResourceRequest, *DeleteResourceResponse) + + // ImportState is called when the provider must import the resource. + // + // If import is not supported, it is recommended to use the + // ResourceImportStateNotImplemented() call in this method. + // + // If setting an attribute with the import identifier, it is recommended + // to use the ResourceImportStatePassthroughID() call in this method. + ImportState(context.Context, ImportResourceStateRequest, *ImportResourceStateResponse) } // ResourceWithModifyPlan represents a resource instance with a ModifyPlan diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/resource_import.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/resource_import.go new file mode 100644 index 0000000000..4c166c3767 --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/resource_import.go @@ -0,0 +1,37 @@ +package tfsdk + +import ( + "context" + + "github.com/hashicorp/terraform-plugin-go/tftypes" +) + +// ResourceImportStateNotImplemented is a helper function to return an error +// diagnostic about the resource not supporting import. The details defaults +// to a generic message to contact the provider developer, but can be +// customized to provide specific information or recommendations. +func ResourceImportStateNotImplemented(ctx context.Context, details string, resp *ImportResourceStateResponse) { + if details == "" { + details = "This resource does not support import. Please contact the provider developer for additional information." + } + + resp.Diagnostics.AddError( + "Resource Import Not Implemented", + details, + ) +} + +// ResourceImportStatePassthroughID is a helper function to set the import +// identifier to a given state attribute path. The attribute must accept a +// string value. +func ResourceImportStatePassthroughID(ctx context.Context, path *tftypes.AttributePath, req ImportResourceStateRequest, resp *ImportResourceStateResponse) { + if path == nil || tftypes.NewAttributePath().Equal(path) { + resp.Diagnostics.AddError( + "Resource Import Passthrough Missing Attribute Path", + "This is always an error in the provider. Please report the following to the provider developer:\n\n"+ + "Resource ImportState method call to ResourceImportStatePassthroughID path must be set to a valid attribute path that can accept a string value.", + ) + } + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path, req.ID)...) +} diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/response_import.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/response_import.go new file mode 100644 index 0000000000..ad8a72b8b4 --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/response_import.go @@ -0,0 +1,21 @@ +package tfsdk + +import ( + "github.com/hashicorp/terraform-plugin-framework/diag" +) + +// ImportResourceStateResponse represents a response to a ImportResourceStateRequest. +// An instance of this response struct is supplied as an argument to the +// Resource's ImportState method, in which the provider should set values on +// the ImportResourceStateResponse as appropriate. +type ImportResourceStateResponse struct { + // Diagnostics report errors or warnings related to importing the + // resource. An empty slice indicates a successful operation with no + // warnings or errors generated. + Diagnostics diag.Diagnostics + + // State is the state of the resource following the import operation. + // It must contain enough information so Terraform can successfully + // refresh the resource, e.g. call the Resource Read method. + State State +} diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/schema.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/schema.go index 416dad5744..a499a76228 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/schema.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/schema.go @@ -84,11 +84,6 @@ func (s Schema) AttributeTypeAtPath(path *tftypes.AttributePath) (attr.Type, err return n.AttributeType(), nil } - // TODO Added: - if n, ok := rawType.(interface{ AttributeType() attr.Type }); ok { - return n.AttributeType(), nil - } - a, ok := rawType.(Attribute) if !ok { return nil, fmt.Errorf("got unexpected type %T", rawType) @@ -272,8 +267,37 @@ func modifyAttributesPlans(ctx context.Context, attrs map[string]Attribute, path modifyAttributesPlans(ctx, nestedAttr.Attributes.GetAttributes(), attrPath.WithElementKeyInt(int64(idx)), req, resp) } case NestingModeSet: - // TODO: Set implementation - // Reference: https://github.com/hashicorp/terraform-plugin-framework/issues/53 + s, ok := attrPlan.(types.Set) + + if !ok { + err := fmt.Errorf("unknown attribute value type (%T) for nesting mode (%T) at path: %s", attrPlan, nm, attrPath) + resp.Diagnostics.AddAttributeError( + attrPath, + "Attribute Plan Modification Error", + "Attribute plan modifier cannot walk schema. Report this to the provider developer:\n\n"+err.Error(), + ) + + return + } + + for _, value := range s.Elems { + tfValueRaw, err := value.ToTerraformValue(ctx) + + if err != nil { + err := fmt.Errorf("error running ToTerraformValue on element value: %v", value) + resp.Diagnostics.AddAttributeError( + attrPath, + "Attribute Plan Modification Error", + "Attribute plan modification cannot convert element into a Terraform value. Report this to the provider developer:\n\n"+err.Error(), + ) + + return + } + + tfValue := tftypes.NewValue(s.ElemType.TerraformType(ctx), tfValueRaw) + + modifyAttributesPlans(ctx, nestedAttr.Attributes.GetAttributes(), attrPath.WithElementKeyValue(tfValue), req, resp) + } case NestingModeMap: m, ok := attrPlan.(types.Map) diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/serve.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/serve.go index 41d123f10b..57f7754c79 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/serve.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/serve.go @@ -1122,14 +1122,6 @@ func (s *server) applyResourceChange(ctx context.Context, req *tfprotov6.ApplyRe } } -func (s *server) ImportResourceState(ctx context.Context, _ *tfprotov6.ImportResourceStateRequest) (*tfprotov6.ImportResourceStateResponse, error) { - // uncomment when we implement this function - //ctx = s.registerContext(ctx) - - // TODO: support resource importing - return &tfprotov6.ImportResourceStateResponse{}, nil -} - // validateDataResourceConfigResponse is a thin abstraction to allow native Diagnostics usage type validateDataResourceConfigResponse struct { Diagnostics diag.Diagnostics diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/serve_import.go b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/serve_import.go new file mode 100644 index 0000000000..b26c62ecf6 --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/tfsdk/serve_import.go @@ -0,0 +1,128 @@ +package tfsdk + +import ( + "context" + + "github.com/hashicorp/terraform-plugin-framework/diag" + "github.com/hashicorp/terraform-plugin-go/tfprotov6" + "github.com/hashicorp/terraform-plugin-go/tftypes" +) + +// importedResource represents a resource that was imported. +// +// This type is not exported as the framework import implementation is +// currently designed for the most common use case of single resource import. +type importedResource struct { + Private []byte + State State + TypeName string +} + +func (r importedResource) toTfprotov6(ctx context.Context) (*tfprotov6.ImportedResource, diag.Diagnostics) { + var diags diag.Diagnostics + irProto6 := &tfprotov6.ImportedResource{ + Private: r.Private, + TypeName: r.TypeName, + } + + stateProto6, err := tfprotov6.NewDynamicValue(r.State.Schema.TerraformType(ctx), r.State.Raw) + + if err != nil { + diags.AddError( + "Error converting imported resource response", + "An unexpected error was encountered when converting the imported resource response to a usable type. This is always a problem with the provider. Please give the following information to the provider developer:\n\n"+err.Error(), + ) + return nil, diags + } + + irProto6.State = &stateProto6 + + return irProto6, diags +} + +// importResourceStateResponse is a thin abstraction to allow native Diagnostics usage +type importResourceStateResponse struct { + Diagnostics diag.Diagnostics + ImportedResources []importedResource +} + +func (r importResourceStateResponse) toTfprotov6(ctx context.Context) *tfprotov6.ImportResourceStateResponse { + resp := &tfprotov6.ImportResourceStateResponse{ + Diagnostics: r.Diagnostics.ToTfprotov6Diagnostics(), + } + + for _, ir := range r.ImportedResources { + irProto6, diags := ir.toTfprotov6(ctx) + resp.Diagnostics = append(resp.Diagnostics, diags.ToTfprotov6Diagnostics()...) + resp.ImportedResources = append(resp.ImportedResources, irProto6) + } + + return resp +} + +func (s *server) importResourceState(ctx context.Context, req *tfprotov6.ImportResourceStateRequest, resp *importResourceStateResponse) { + resourceType, diags := s.getResourceType(ctx, req.TypeName) + resp.Diagnostics.Append(diags...) + + if resp.Diagnostics.HasError() { + return + } + + resourceSchema, diags := resourceType.GetSchema(ctx) + resp.Diagnostics.Append(diags...) + + if resp.Diagnostics.HasError() { + return + } + + resource, diags := resourceType.NewResource(ctx, s.p) + resp.Diagnostics.Append(diags...) + + if resp.Diagnostics.HasError() { + return + } + + emptyState := tftypes.NewValue(resourceSchema.TerraformType(ctx), nil) + importReq := ImportResourceStateRequest{ + ID: req.ID, + } + importResp := ImportResourceStateResponse{ + State: State{ + Raw: emptyState, + Schema: resourceSchema, + }, + } + + resource.ImportState(ctx, importReq, &importResp) + resp.Diagnostics.Append(importResp.Diagnostics...) + + if resp.Diagnostics.HasError() { + return + } + + if importResp.State.Raw.Equal(emptyState) { + resp.Diagnostics.AddError( + "Missing Resource Import State", + "An unexpected error was encountered when importing the resource. This is always a problem with the provider. Please give the following information to the provider developer:\n\n"+ + "Resource ImportState method returned no State in response. If import is intentionally not supported, call the ResourceImportStateNotImplemented() function or return an error.", + ) + return + } + + resp.ImportedResources = []importedResource{ + { + State: importResp.State, + TypeName: req.TypeName, + }, + } +} + +// ImportResourceState satisfies the tfprotov6.ProviderServer interface. +func (s *server) ImportResourceState(ctx context.Context, req *tfprotov6.ImportResourceStateRequest) (*tfprotov6.ImportResourceStateResponse, error) { + ctx = s.registerContext(ctx) + resp := &importResourceStateResponse{} + + s.importResourceState(ctx, req, resp) + + return resp.toTfprotov6(ctx), nil +} diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/types/list.go b/vendor/github.com/hashicorp/terraform-plugin-framework/types/list.go index 6dc9be2224..12d2c5b038 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/types/list.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/types/list.go @@ -101,6 +101,11 @@ func (l ListType) ApplyTerraform5AttributePathStep(step tftypes.AttributePathSte return l.ElemType, nil } +// String returns a human-friendly description of the ListType. +func (l ListType) String() string { + return "types.ListType[" + l.ElemType.String() + "]" +} + // List represents a list of AttributeValues, all of the same type, indicated // by ElemType. type List struct { diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/types/map.go b/vendor/github.com/hashicorp/terraform-plugin-framework/types/map.go index 84651f2af7..166d774bc6 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/types/map.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/types/map.go @@ -99,6 +99,11 @@ func (m MapType) ApplyTerraform5AttributePathStep(step tftypes.AttributePathStep return m.ElemType, nil } +// String returns a human-friendly description of the MapType. +func (m MapType) String() string { + return "types.MapType[" + m.ElemType.String() + "]" +} + // Map represents a map of AttributeValues, all of the same type, indicated by // ElemType. Keys for the map will always be strings. type Map struct { diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/types/object.go b/vendor/github.com/hashicorp/terraform-plugin-framework/types/object.go index 220773d9db..c152f52769 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-framework/types/object.go +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/types/object.go @@ -3,6 +3,8 @@ package types import ( "context" "fmt" + "sort" + "strings" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/diag" @@ -112,6 +114,26 @@ func (o ObjectType) ApplyTerraform5AttributePathStep(step tftypes.AttributePathS return o.AttrTypes[string(step.(tftypes.AttributeName))], nil } +// String returns a human-friendly description of the ObjectType. +func (o ObjectType) String() string { + var res strings.Builder + res.WriteString("types.ObjectType[") + keys := make([]string, 0, len(o.AttrTypes)) + for k := range o.AttrTypes { + keys = append(keys, k) + } + sort.Strings(keys) + for pos, key := range keys { + if pos != 0 { + res.WriteString(", ") + } + res.WriteString(`"` + key + `":`) + res.WriteString(o.AttrTypes[key].String()) + } + res.WriteString("]") + return res.String() +} + // Object represents an object type Object struct { // Unknown will be set to true if the entire object is an unknown value. diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/types/set.go b/vendor/github.com/hashicorp/terraform-plugin-framework/types/set.go new file mode 100644 index 0000000000..2ad60fb686 --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/types/set.go @@ -0,0 +1,279 @@ +package types + +import ( + "context" + "fmt" + + "github.com/hashicorp/terraform-plugin-framework/attr" + "github.com/hashicorp/terraform-plugin-framework/diag" + "github.com/hashicorp/terraform-plugin-framework/internal/reflect" + "github.com/hashicorp/terraform-plugin-go/tftypes" +) + +var ( + _ attr.TypeWithValidate = SetType{} + _ attr.Value = &Set{} +) + +// SetType is an AttributeType representing a set of values. All values must +// be of the same type, which the provider must specify as the ElemType +// property. +type SetType struct { + ElemType attr.Type +} + +// ElementType returns the attr.Type elements will be created from. +func (t SetType) ElementType() attr.Type { + return t.ElemType +} + +// WithElementType returns a SetType that is identical to `l`, but with the +// element type set to `typ`. +func (t SetType) WithElementType(typ attr.Type) attr.TypeWithElementType { + return SetType{ElemType: typ} +} + +// TerraformType returns the tftypes.Type that should be used to +// represent this type. This constrains what user input will be +// accepted and what kind of data can be set in state. The framework +// will use this to translate the AttributeType to something Terraform +// can understand. +func (t SetType) TerraformType(ctx context.Context) tftypes.Type { + return tftypes.Set{ + ElementType: t.ElemType.TerraformType(ctx), + } +} + +// ValueFromTerraform returns an AttributeValue given a tftypes.Value. +// This is meant to convert the tftypes.Value into a more convenient Go +// type for the provider to consume the data with. +func (t SetType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) { + if !in.Type().Is(t.TerraformType(ctx)) { + return nil, fmt.Errorf("can't use %s as value of Set with ElementType %T, can only use %s values", in.String(), t.ElemType, t.ElemType.TerraformType(ctx).String()) + } + set := Set{ + ElemType: t.ElemType, + } + if !in.IsKnown() { + set.Unknown = true + return set, nil + } + if in.IsNull() { + set.Null = true + return set, nil + } + val := []tftypes.Value{} + err := in.As(&val) + if err != nil { + return nil, err + } + elems := make([]attr.Value, 0, len(val)) + for _, elem := range val { + av, err := t.ElemType.ValueFromTerraform(ctx, elem) + if err != nil { + return nil, err + } + elems = append(elems, av) + } + set.Elems = elems + return set, nil +} + +// Equal returns true if `o` is also a SetType and has the same ElemType. +func (t SetType) Equal(o attr.Type) bool { + if t.ElemType == nil { + return false + } + other, ok := o.(SetType) + if !ok { + return false + } + return t.ElemType.Equal(other.ElemType) +} + +// ApplyTerraform5AttributePathStep applies the given AttributePathStep to the +// set. +func (t SetType) ApplyTerraform5AttributePathStep(step tftypes.AttributePathStep) (interface{}, error) { + if _, ok := step.(tftypes.ElementKeyValue); !ok { + return nil, fmt.Errorf("cannot apply step %T to SetType", step) + } + + return t.ElemType, nil +} + +// String returns a human-friendly description of the SetType. +func (t SetType) String() string { + return "types.SetType[" + t.ElemType.String() + "]" +} + +// Validate implements type validation. This type requires all elements to be +// unique. +func (s SetType) Validate(ctx context.Context, in tftypes.Value, path *tftypes.AttributePath) diag.Diagnostics { + var diags diag.Diagnostics + + if !in.Type().Is(tftypes.Set{}) { + err := fmt.Errorf("expected Set value, received %T with value: %v", in, in) + diags.AddAttributeError( + path, + "Set Type Validation Error", + "An unexpected error was encountered trying to validate an attribute value. This is always an error in the provider. Please report the following to the provider developer:\n\n"+err.Error(), + ) + return diags + } + + if !in.IsKnown() || in.IsNull() { + return diags + } + + var elems []tftypes.Value + + if err := in.As(&elems); err != nil { + diags.AddAttributeError( + path, + "Set Type Validation Error", + "An unexpected error was encountered trying to validate an attribute value. This is always an error in the provider. Please report the following to the provider developer:\n\n"+err.Error(), + ) + return diags + } + + // Attempting to use map[tftypes.Value]struct{} for duplicate detection yields: + // panic: runtime error: hash of unhashable type tftypes.primitive + // Instead, use for loops. + for indexOuter, elemOuter := range elems { + // Only evaluate fully known values for duplicates. + if !elemOuter.IsFullyKnown() { + continue + } + + for indexInner := indexOuter + 1; indexInner < len(elems); indexInner++ { + elemInner := elems[indexInner] + + if !elemInner.Equal(elemOuter) { + continue + } + + diags.AddAttributeError( + path.WithElementKeyValue(elemInner), + "Duplicate Set Element", + fmt.Sprintf("This attribute contains duplicate values of: %s", elemInner), + ) + } + } + + return diags +} + +// Set represents a set of AttributeValues, all of the same type, indicated +// by ElemType. +type Set struct { + // Unknown will be set to true if the entire set is an unknown value. + // If only some of the elements in the set are unknown, their known or + // unknown status will be represented however that AttributeValue + // surfaces that information. The Set's Unknown property only tracks + // if the number of elements in a Set is known, not whether the + // elements that are in the set are known. + Unknown bool + + // Null will be set to true if the set is null, either because it was + // omitted from the configuration, state, or plan, or because it was + // explicitly set to null. + Null bool + + // Elems are the elements in the set. + Elems []attr.Value + + // ElemType is the tftypes.Type of the elements in the set. All + // elements in the set must be of this type. + ElemType attr.Type +} + +// ElementsAs populates `target` with the elements of the Set, throwing an +// error if the elements cannot be stored in `target`. +func (s Set) ElementsAs(ctx context.Context, target interface{}, allowUnhandled bool) diag.Diagnostics { + // we need a tftypes.Value for this Set to be able to use it with our + // reflection code + values, err := s.ToTerraformValue(ctx) + if err != nil { + return diag.Diagnostics{ + diag.NewErrorDiagnostic( + "Set Element Conversion Error", + "An unexpected error was encountered trying to convert set elements. This is always an error in the provider. Please report the following to the provider developer:\n\n"+err.Error(), + ), + } + } + return reflect.Into(ctx, SetType{ElemType: s.ElemType}, tftypes.NewValue(tftypes.Set{ + ElementType: s.ElemType.TerraformType(ctx), + }, values), target, reflect.Options{ + UnhandledNullAsEmpty: allowUnhandled, + UnhandledUnknownAsEmpty: allowUnhandled, + }) +} + +// Type returns a SetType with the same element type as `s`. +func (s Set) Type(ctx context.Context) attr.Type { + return SetType{ElemType: s.ElemType} +} + +// ToTerraformValue returns the data contained in the AttributeValue as +// a Go type that tftypes.NewValue will accept. +func (s Set) ToTerraformValue(ctx context.Context) (interface{}, error) { + if s.Unknown { + return tftypes.UnknownValue, nil + } + if s.Null { + return nil, nil + } + vals := make([]tftypes.Value, 0, len(s.Elems)) + for _, elem := range s.Elems { + val, err := elem.ToTerraformValue(ctx) + if err != nil { + return nil, err + } + err = tftypes.ValidateValue(s.ElemType.TerraformType(ctx), val) + if err != nil { + return nil, fmt.Errorf("error validating terraform type: %w", err) + } + vals = append(vals, tftypes.NewValue(s.ElemType.TerraformType(ctx), val)) + } + return vals, nil +} + +// Equal must return true if the AttributeValue is considered +// semantically equal to the AttributeValue passed as an argument. +func (s Set) Equal(o attr.Value) bool { + other, ok := o.(Set) + if !ok { + return false + } + if s.Unknown != other.Unknown { + return false + } + if s.Null != other.Null { + return false + } + if s.ElemType == nil && other.ElemType != nil { + return false + } + if s.ElemType != nil && !s.ElemType.Equal(other.ElemType) { + return false + } + if len(s.Elems) != len(other.Elems) { + return false + } + for _, elem := range s.Elems { + if !other.contains(elem) { + return false + } + } + return true +} + +func (s Set) contains(v attr.Value) bool { + for _, elem := range s.Elems { + if elem.Equal(v) { + return true + } + } + + return false +} diff --git a/vendor/modules.txt b/vendor/modules.txt index d96f291468..e2fa6a8dc3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -221,7 +221,7 @@ github.com/hashicorp/terraform-exec/tfexec github.com/hashicorp/terraform-exec/tfinstall # github.com/hashicorp/terraform-json v0.12.0 github.com/hashicorp/terraform-json -# github.com/hashicorp/terraform-plugin-framework v0.2.1-0.20210817164910-fad6afe33058 => github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210908155737-cef60d646d77 +# github.com/hashicorp/terraform-plugin-framework v0.3.1-0.20210915151717-8de1d13d8636 ## explicit github.com/hashicorp/terraform-plugin-framework/attr github.com/hashicorp/terraform-plugin-framework/diag @@ -534,4 +534,3 @@ google.golang.org/protobuf/types/known/timestamppb google.golang.org/protobuf/types/pluginpb # github.com/aws/aws-sdk-go-v2/service/cloudformation => github.com/hashicorp/aws-sdk-go-v2-service-cloudformation-private v0.0.0-20210723211334-303716fc7a60 # github.com/aws/aws-sdk-go-v2/credentials => github.com/gdavison/aws-sdk-go-v2/credentials v1.2.2-0.20210811194025-146c1ad6c3b2 -# github.com/hashicorp/terraform-plugin-framework => github.com/ewbankkit/terraform-plugin-framework v0.2.1-0.20210908155737-cef60d646d77