fix: Rename S3 Resources

resources/provider/provider.go

@@ -208,8 +208,8 @@ func Provider() *provider.Provider {
 			"route53.hosted_zones":                    route53.Route53HostedZones(),
 			"route53.reusable_delegation_sets":        route53.Route53ReusableDelegationSets(),
 			"route53.traffic_policies":                route53.Route53TrafficPolicies(),
-			"s3.accounts":                             s3.S3Accounts(),
-			"s3.buckets":                              s3.S3Buckets(),
+			"s3.accounts":                             s3.Accounts(),
+			"s3.buckets":                              s3.Buckets(),
 			"sagemaker.endpoint_configurations":       sagemaker.SagemakerEndpointConfigurations(),
 			"sagemaker.models":                        sagemaker.SagemakerModels(),
 			"sagemaker.notebook_instances":            sagemaker.SagemakerNotebookInstances(),

resources/services/s3/accounts.go

@@ -17,7 +17,7 @@ type S3AccountConfig struct {
 	ConfigExists bool
 }
 
-func S3Accounts() *schema.Table {
+func Accounts() *schema.Table {
 	return &schema.Table{
 		Name:         "aws_s3_account_config",
 		Description:  "Account configurations for S3",

resources/services/s3/buckets.go

@@ -34,7 +34,7 @@ type WrappedBucket struct {
 // fetchS3BucketsPoolSize describes the amount of go routines that resolve the S3 buckets
 const fetchS3BucketsPoolSize = 10
 
-func S3Buckets() *schema.Table {
+func Buckets() *schema.Table {
 	return &schema.Table{
 		Name:         "aws_s3_buckets",
 		Description:  "An Amazon S3 bucket is a public cloud storage resource available in Amazon Web Services' (AWS) Simple Storage Service (S3)",
@@ -189,7 +189,6 @@ func S3Buckets() *schema.Table {
 				Name:          "aws_s3_bucket_cors_rules",
 				Description:   "Specifies a cross-origin access rule for an Amazon S3 bucket.",
 				Resolver:      fetchS3BucketCorsRules,
-				IgnoreError:   client.IgnoreCommonErrors,
 				IgnoreInTests: true,
 				Columns: []schema.Column{
 					{
@@ -235,7 +234,6 @@ func S3Buckets() *schema.Table {
 				Name:          "aws_s3_bucket_encryption_rules",
 				Description:   "Specifies the default server-side encryption configuration.",
 				Resolver:      fetchS3BucketEncryptionRules,
-				IgnoreError:   client.IgnoreCommonErrors,
 				IgnoreInTests: true,
 				Columns: []schema.Column{
 					{
@@ -267,7 +265,6 @@ func S3Buckets() *schema.Table {
 				Name:          "aws_s3_bucket_replication_rules",
 				Description:   "Specifies which Amazon S3 objects to replicate and where to store the replicas.",
 				Resolver:      fetchS3BucketReplicationRules,
-				IgnoreError:   client.IgnoreCommonErrors,
 				IgnoreInTests: true,
 				Columns: []schema.Column{
 					{
@@ -385,7 +382,6 @@ func S3Buckets() *schema.Table {
 			{
 				Name:          "aws_s3_bucket_lifecycles",
 				Description:   "A lifecycle rule for individual objects in an Amazon S3 bucket.",
-				IgnoreError:   client.IgnoreCommonErrors,
 				Resolver:      fetchS3BucketLifecycles,
 				IgnoreInTests: true,
 				Columns: []schema.Column{

resources/services/s3/buckets_mock_test.go

@@ -154,5 +154,5 @@ func buildS3Buckets(t *testing.T, ctrl *gomock.Controller) client.Services {
 }
 
 func TestS3Buckets(t *testing.T) {
-	client.AwsMockTestHelper(t, S3Buckets(), buildS3Buckets, client.TestOptions{})
+	client.AwsMockTestHelper(t, Buckets(), buildS3Buckets, client.TestOptions{})
 }