sundowndev
/
driftctl
mirror of https://github.com/sundowndev/driftctl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #348 from cloudskiff/fix/filterS3 

Filter out s3 buckets from different regions
main
Elie 2021-03-18 13:56:27 +01:00 committed by GitHub
parent 5bda4de17f 925decb2ba
commit aa7b6e770e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 120 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/remote/aws/s3_bucket_analytic_supplier.go
View File

@ -7,6 +7,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
"github.com/cloudskiff/driftctl/pkg/remote/deserializer" "github.com/cloudskiff/driftctl/pkg/remote/deserializer"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
"github.com/cloudskiff/driftctl/pkg/resource/aws" "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -15,10 +16,11 @@ import (
) )
type S3BucketAnalyticSupplier struct { type S3BucketAnalyticSupplier struct {
reader terraform.ResourceReader reader terraform.ResourceReader
deserializer deserializer.CTYDeserializer deserializer deserializer.CTYDeserializer
repository repository.S3Repository repository repository.S3Repository
runner *terraform.ParallelResourceReader runner *terraform.ParallelResourceReader
providerConfig tf.TerraformProviderConfig
} }
func NewS3BucketAnalyticSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketAnalyticSupplier { func NewS3BucketAnalyticSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketAnalyticSupplier {
@ -27,6 +29,7 @@ func NewS3BucketAnalyticSupplier(provider *AWSTerraformProvider, repository repo
awsdeserializer.NewS3BucketAnalyticDeserializer(), awsdeserializer.NewS3BucketAnalyticDeserializer(),
repository, repository,
terraform.NewParallelResourceReader(provider.Runner().SubRunner()), terraform.NewParallelResourceReader(provider.Runner().SubRunner()),
provider.Config,
} }
} }
@ -42,7 +45,7 @@ func (s *S3BucketAnalyticSupplier) Resources() ([]resource.Resource, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if region == "" { if region == "" || region != s.providerConfig.DefaultAlias {
continue continue
} }
if err := s.listBucketAnalyticConfiguration(&bucket, region); err != nil { if err := s.listBucketAnalyticConfiguration(&bucket, region); err != nil {

33
pkg/remote/aws/s3_bucket_analytic_supplier_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/client" "github.com/cloudskiff/driftctl/pkg/remote/aws/client"
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws" resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -66,18 +67,6 @@ func TestS3BucketAnalyticSupplier_Resources(t *testing.T) {
nil, nil,
) )
repository.On(
"ListBucketAnalyticsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
"eu-west-1",
).Return(
[]*s3.AnalyticsConfiguration{
{Id: awssdk.String("Analytics_Bucket1")},
{Id: awssdk.String("Analytics2_Bucket1")},
},
nil,
)
repository.On( repository.On(
"ListBucketAnalyticsConfigurations", "ListBucketAnalyticsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")},
@ -89,18 +78,6 @@ func TestS3BucketAnalyticSupplier_Resources(t *testing.T) {
}, },
nil, nil,
) )
repository.On(
"ListBucketAnalyticsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift3")},
"ap-northeast-1",
).Return(
[]*s3.AnalyticsConfiguration{
{Id: awssdk.String("Analytics_Bucket3")},
{Id: awssdk.String("Analytics2_Bucket3")},
},
nil,
)
}, },
}, },
@ -124,14 +101,14 @@ func TestS3BucketAnalyticSupplier_Resources(t *testing.T) {
"GetBucketLocation", "GetBucketLocation",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
).Return( ).Return(
"eu-west-1", "eu-west-3",
nil, nil,
) )
repository.On( repository.On(
"ListBucketAnalyticsConfigurations", "ListBucketAnalyticsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
"eu-west-1", "eu-west-3",
).Return( ).Return(
nil, nil,
awserr.NewRequestFailure(nil, 403, ""), awserr.NewRequestFailure(nil, 403, ""),
@ -169,6 +146,10 @@ func TestS3BucketAnalyticSupplier_Resources(t *testing.T) {
deserializer, deserializer,
&mock, &mock,
terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)), terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)),
tf.TerraformProviderConfig{
Name: "test",
DefaultAlias: "eu-west-3",
},
} }
got, err := s.Resources() got, err := s.Resources()
assert.Equal(t, err, tt.wantErr) assert.Equal(t, err, tt.wantErr)

13
pkg/remote/aws/s3_bucket_inventory_supplier.go
View File

@ -7,6 +7,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
"github.com/cloudskiff/driftctl/pkg/remote/deserializer" "github.com/cloudskiff/driftctl/pkg/remote/deserializer"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
"github.com/cloudskiff/driftctl/pkg/resource/aws" "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -15,10 +16,11 @@ import (
) )
type S3BucketInventorySupplier struct { type S3BucketInventorySupplier struct {
reader terraform.ResourceReader reader terraform.ResourceReader
deserializer deserializer.CTYDeserializer deserializer deserializer.CTYDeserializer
repository repository.S3Repository repository repository.S3Repository
runner *terraform.ParallelResourceReader runner *terraform.ParallelResourceReader
providerConfig tf.TerraformProviderConfig
} }
func NewS3BucketInventorySupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketInventorySupplier { func NewS3BucketInventorySupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketInventorySupplier {
@ -27,6 +29,7 @@ func NewS3BucketInventorySupplier(provider *AWSTerraformProvider, repository rep
awsdeserializer.NewS3BucketInventoryDeserializer(), awsdeserializer.NewS3BucketInventoryDeserializer(),
repository, repository,
terraform.NewParallelResourceReader(provider.Runner().SubRunner()), terraform.NewParallelResourceReader(provider.Runner().SubRunner()),
provider.Config,
} }
} }
@ -42,7 +45,7 @@ func (s *S3BucketInventorySupplier) Resources() ([]resource.Resource, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if region == "" { if region == "" || region != s.providerConfig.DefaultAlias {
continue continue
} }
if err := s.listBucketInventoryConfiguration(&bucket, region); err != nil { if err := s.listBucketInventoryConfiguration(&bucket, region); err != nil {

34
pkg/remote/aws/s3_bucket_inventory_supplier_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/client" "github.com/cloudskiff/driftctl/pkg/remote/aws/client"
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws" resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -64,18 +65,6 @@ func TestS3BucketInventorySupplier_Resources(t *testing.T) {
nil, nil,
) )
repository.On(
"ListBucketInventoryConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
"eu-west-1",
).Return(
[]*s3.InventoryConfiguration{
{Id: awssdk.String("Inventory_Bucket1")},
{Id: awssdk.String("Inventory2_Bucket1")},
},
nil,
)
repository.On( repository.On(
"ListBucketInventoryConfigurations", "ListBucketInventoryConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")},
@ -87,18 +76,6 @@ func TestS3BucketInventorySupplier_Resources(t *testing.T) {
}, },
nil, nil,
) )
repository.On(
"ListBucketInventoryConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift3")},
"eu-west-1",
).Return(
[]*s3.InventoryConfiguration{
{Id: awssdk.String("Inventory_Bucket3")},
{Id: awssdk.String("Inventory2_Bucket3")},
},
nil,
)
}, },
}, },
{ {
@ -121,18 +98,17 @@ func TestS3BucketInventorySupplier_Resources(t *testing.T) {
"GetBucketLocation", "GetBucketLocation",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
).Return( ).Return(
"eu-west-1", "eu-west-3",
nil, nil,
) )
repository.On( repository.On(
"ListBucketInventoryConfigurations", "ListBucketInventoryConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
"eu-west-1", "eu-west-3",
).Return( ).Return(
nil, nil,
awserr.NewRequestFailure(nil, 403, ""), awserr.NewRequestFailure(nil, 403, ""),
) )
}, },
wantErr: remoteerror.NewResourceEnumerationError(awserr.NewRequestFailure(nil, 403, ""), resourceaws.AwsS3BucketInventoryResourceType), wantErr: remoteerror.NewResourceEnumerationError(awserr.NewRequestFailure(nil, 403, ""), resourceaws.AwsS3BucketInventoryResourceType),
}, },
@ -165,6 +141,10 @@ func TestS3BucketInventorySupplier_Resources(t *testing.T) {
deserializer, deserializer,
&mock, &mock,
terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)), terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)),
tf.TerraformProviderConfig{
Name: "test",
DefaultAlias: "eu-west-3",
},
} }
got, err := s.Resources() got, err := s.Resources()
assert.Equal(t, err, tt.wantErr) assert.Equal(t, err, tt.wantErr)

33
pkg/remote/aws/s3_bucket_metric_supplier_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/client" "github.com/cloudskiff/driftctl/pkg/remote/aws/client"
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws" resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -64,18 +65,6 @@ func TestS3BucketMetricSupplier_Resources(t *testing.T) {
nil, nil,
) )
repository.On(
"ListBucketMetricsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
"eu-west-1",
).Return(
[]*s3.MetricsConfiguration{
{Id: awssdk.String("Metrics_Bucket1")},
{Id: awssdk.String("Metrics2_Bucket1")},
},
nil,
)
repository.On( repository.On(
"ListBucketMetricsConfigurations", "ListBucketMetricsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")},
@ -87,18 +76,6 @@ func TestS3BucketMetricSupplier_Resources(t *testing.T) {
}, },
nil, nil,
) )
repository.On(
"ListBucketMetricsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift3")},
"ap-northeast-1",
).Return(
[]*s3.MetricsConfiguration{
{Id: awssdk.String("Metrics_Bucket3")},
{Id: awssdk.String("Metrics2_Bucket3")},
},
nil,
)
}, },
}, },
{ {
@ -121,14 +98,14 @@ func TestS3BucketMetricSupplier_Resources(t *testing.T) {
"GetBucketLocation", "GetBucketLocation",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
).Return( ).Return(
"eu-west-1", "eu-west-3",
nil, nil,
) )
repository.On( repository.On(
"ListBucketMetricsConfigurations", "ListBucketMetricsConfigurations",
&s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")}, &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift")},
"eu-west-1", "eu-west-3",
).Return( ).Return(
nil, nil,
awserr.NewRequestFailure(nil, 403, ""), awserr.NewRequestFailure(nil, 403, ""),
@ -165,6 +142,10 @@ func TestS3BucketMetricSupplier_Resources(t *testing.T) {
deserializer, deserializer,
&mock, &mock,
terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)), terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)),
tf.TerraformProviderConfig{
Name: "test",
DefaultAlias: "eu-west-3",
},
} }
got, err := s.Resources() got, err := s.Resources()
assert.Equal(t, err, tt.wantErr) assert.Equal(t, err, tt.wantErr)

13
pkg/remote/aws/s3_bucket_metrics_supplier.go
View File

@ -7,6 +7,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
"github.com/cloudskiff/driftctl/pkg/remote/deserializer" "github.com/cloudskiff/driftctl/pkg/remote/deserializer"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
"github.com/cloudskiff/driftctl/pkg/resource/aws" "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -15,10 +16,11 @@ import (
) )
type S3BucketMetricSupplier struct { type S3BucketMetricSupplier struct {
reader terraform.ResourceReader reader terraform.ResourceReader
deserializer deserializer.CTYDeserializer deserializer deserializer.CTYDeserializer
repository repository.S3Repository repository repository.S3Repository
runner *terraform.ParallelResourceReader runner *terraform.ParallelResourceReader
providerConfig tf.TerraformProviderConfig
} }
func NewS3BucketMetricSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketMetricSupplier { func NewS3BucketMetricSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketMetricSupplier {
@ -27,6 +29,7 @@ func NewS3BucketMetricSupplier(provider *AWSTerraformProvider, repository reposi
awsdeserializer.NewS3BucketMetricDeserializer(), awsdeserializer.NewS3BucketMetricDeserializer(),
repository, repository,
terraform.NewParallelResourceReader(provider.Runner().SubRunner()), terraform.NewParallelResourceReader(provider.Runner().SubRunner()),
provider.Config,
} }
} }
@ -42,7 +45,7 @@ func (s *S3BucketMetricSupplier) Resources() ([]resource.Resource, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if region == "" { if region == "" || region != s.providerConfig.DefaultAlias {
continue continue
} }
if err := s.listBucketMetricConfiguration(&bucket, region); err != nil { if err := s.listBucketMetricConfiguration(&bucket, region); err != nil {

13
pkg/remote/aws/s3_bucket_notification_supplier.go
View File

@ -4,6 +4,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
"github.com/cloudskiff/driftctl/pkg/remote/deserializer" "github.com/cloudskiff/driftctl/pkg/remote/deserializer"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
"github.com/cloudskiff/driftctl/pkg/resource/aws" "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -12,10 +13,11 @@ import (
) )
type S3BucketNotificationSupplier struct { type S3BucketNotificationSupplier struct {
reader terraform.ResourceReader reader terraform.ResourceReader
deserializer deserializer.CTYDeserializer deserializer deserializer.CTYDeserializer
repository repository.S3Repository repository repository.S3Repository
runner *terraform.ParallelResourceReader runner *terraform.ParallelResourceReader
providerConfig tf.TerraformProviderConfig
} }
func NewS3BucketNotificationSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketNotificationSupplier { func NewS3BucketNotificationSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketNotificationSupplier {
@ -24,6 +26,7 @@ func NewS3BucketNotificationSupplier(provider *AWSTerraformProvider, repository
awsdeserializer.NewS3BucketNotificationDeserializer(), awsdeserializer.NewS3BucketNotificationDeserializer(),
repository, repository,
terraform.NewParallelResourceReader(provider.Runner().SubRunner()), terraform.NewParallelResourceReader(provider.Runner().SubRunner()),
provider.Config,
} }
} }
@ -39,7 +42,7 @@ func (s *S3BucketNotificationSupplier) Resources() ([]resource.Resource, error)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if region == "" { if region == "" || region != s.providerConfig.DefaultAlias {
continue continue
} }
s.runner.Run(func() (cty.Value, error) { s.runner.Run(func() (cty.Value, error) {

5
pkg/remote/aws/s3_bucket_notification_supplier_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/client" "github.com/cloudskiff/driftctl/pkg/remote/aws/client"
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws" resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -119,6 +120,10 @@ func TestS3BucketNotificationSupplier_Resources(t *testing.T) {
deserializer, deserializer,
&mock, &mock,
terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)), terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)),
tf.TerraformProviderConfig{
Name: "test",
DefaultAlias: "eu-west-3",
},
} }
got, err := s.Resources() got, err := s.Resources()
assert.Equal(t, err, tt.wantErr) assert.Equal(t, err, tt.wantErr)

13
pkg/remote/aws/s3_bucket_policy_supplier.go
View File

@ -4,6 +4,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
"github.com/cloudskiff/driftctl/pkg/remote/deserializer" "github.com/cloudskiff/driftctl/pkg/remote/deserializer"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
"github.com/cloudskiff/driftctl/pkg/resource/aws" "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -12,10 +13,11 @@ import (
) )
type S3BucketPolicySupplier struct { type S3BucketPolicySupplier struct {
reader terraform.ResourceReader reader terraform.ResourceReader
deserializer deserializer.CTYDeserializer deserializer deserializer.CTYDeserializer
repository repository.S3Repository repository repository.S3Repository
runner *terraform.ParallelResourceReader runner *terraform.ParallelResourceReader
providerConfig tf.TerraformProviderConfig
} }
func NewS3BucketPolicySupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketPolicySupplier { func NewS3BucketPolicySupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketPolicySupplier {
@ -24,6 +26,7 @@ func NewS3BucketPolicySupplier(provider *AWSTerraformProvider, repository reposi
awsdeserializer.NewS3BucketPolicyDeserializer(), awsdeserializer.NewS3BucketPolicyDeserializer(),
repository, repository,
terraform.NewParallelResourceReader(provider.Runner().SubRunner()), terraform.NewParallelResourceReader(provider.Runner().SubRunner()),
provider.Config,
} }
} }
@ -39,7 +42,7 @@ func (s *S3BucketPolicySupplier) Resources() ([]resource.Resource, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if region == "" { if region == "" || region != s.providerConfig.DefaultAlias {
continue continue
} }
s.runner.Run(func() (cty.Value, error) { s.runner.Run(func() (cty.Value, error) {

5
pkg/remote/aws/s3_bucket_policy_supplier_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/cloudskiff/driftctl/pkg/remote/aws/client" "github.com/cloudskiff/driftctl/pkg/remote/aws/client"
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws" resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -120,6 +121,10 @@ func TestS3BucketPolicySupplier_Resources(t *testing.T) {
deserializer, deserializer,
&mock, &mock,
terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)), terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)),
tf.TerraformProviderConfig{
Name: "test",
DefaultAlias: "eu-west-3",
},
} }
got, err := s.Resources() got, err := s.Resources()
assert.Equal(t, err, tt.wantErr) assert.Equal(t, err, tt.wantErr)

17
pkg/remote/aws/s3_bucket_supplier.go
View File

@ -2,21 +2,25 @@ package aws
import ( import (
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/zclconf/go-cty/cty"
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
"github.com/cloudskiff/driftctl/pkg/remote/deserializer" "github.com/cloudskiff/driftctl/pkg/remote/deserializer"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
"github.com/cloudskiff/driftctl/pkg/resource/aws" "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
"github.com/cloudskiff/driftctl/pkg/terraform" "github.com/cloudskiff/driftctl/pkg/terraform"
"github.com/zclconf/go-cty/cty"
) )
type S3BucketSupplier struct { type S3BucketSupplier struct {
reader terraform.ResourceReader reader terraform.ResourceReader
deserializer deserializer.CTYDeserializer deserializer deserializer.CTYDeserializer
repository repository.S3Repository repository repository.S3Repository
runner *terraform.ParallelResourceReader runner *terraform.ParallelResourceReader
providerConfig tf.TerraformProviderConfig
} }
func NewS3BucketSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketSupplier { func NewS3BucketSupplier(provider *AWSTerraformProvider, repository repository.S3Repository) *S3BucketSupplier {
@ -25,6 +29,7 @@ func NewS3BucketSupplier(provider *AWSTerraformProvider, repository repository.S
awsdeserializer.NewS3BucketDeserializer(), awsdeserializer.NewS3BucketDeserializer(),
repository, repository,
terraform.NewParallelResourceReader(provider.Runner().SubRunner()), terraform.NewParallelResourceReader(provider.Runner().SubRunner()),
provider.Config,
} }
} }
@ -53,7 +58,7 @@ func (s *S3BucketSupplier) readBucket(bucket s3.Bucket) (cty.Value, error) {
if err != nil { if err != nil {
return cty.NilVal, err return cty.NilVal, err
} }
if region == "" { if region == "" || region != s.providerConfig.DefaultAlias {
return cty.NilVal, nil return cty.NilVal, nil
} }

6
pkg/remote/aws/s3_bucket_supplier_test.go
View File

@ -7,10 +7,12 @@ import (
awssdk "github.com/aws/aws-sdk-go/aws" awssdk "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/cloudskiff/driftctl/pkg/parallel" "github.com/cloudskiff/driftctl/pkg/parallel"
"github.com/cloudskiff/driftctl/pkg/remote/aws/client" "github.com/cloudskiff/driftctl/pkg/remote/aws/client"
"github.com/cloudskiff/driftctl/pkg/remote/aws/repository" "github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error" remoteerror "github.com/cloudskiff/driftctl/pkg/remote/error"
tf "github.com/cloudskiff/driftctl/pkg/remote/terraform"
"github.com/cloudskiff/driftctl/pkg/resource" "github.com/cloudskiff/driftctl/pkg/resource"
resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws" resourceaws "github.com/cloudskiff/driftctl/pkg/resource/aws"
awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer" awsdeserializer "github.com/cloudskiff/driftctl/pkg/resource/aws/deserializer"
@ -100,6 +102,10 @@ func TestS3BucketSupplier_Resources(t *testing.T) {
deserializer, deserializer,
&mock, &mock,
terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)), terraform.NewParallelResourceReader(parallel.NewParallelRunner(context.TODO(), 10)),
tf.TerraformProviderConfig{
Name: "test",
DefaultAlias: "eu-west-3",
},
} }
got, err := s.Resources() got, err := s.Resources()
assert.Equal(t, err, tt.wantErr) assert.Equal(t, err, tt.wantErr)

5
pkg/remote/aws/test/s3_bucket_analytics_multiple/aws_s3_bucket_analytics_configuration-bucket-martin-test-drift3_Analytics2_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3NfYW5hbHlzaXMiOlsibGlzdCIsWyJvYmplY3QiLHsiZGF0YV9leHBvcnQiOlsibGlzdCIsWyJvYmplY3QiLHsiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiczNfYnVja2V0X2Rlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImJ1Y2tldF9hY2NvdW50X2lkIjoic3RyaW5nIiwiYnVja2V0X2FybiI6InN0cmluZyIsImZvcm1hdCI6InN0cmluZyIsInByZWZpeCI6InN0cmluZyJ9XV19XV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6InN0cmluZyJ9XV19XV19XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiZmlsdGVyIjpbXSwiaWQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzOkFuYWx5dGljczJfQnVja2V0MyIsIm5hbWUiOiJBbmFseXRpY3MyX0J1Y2tldDMiLCJzdG9yYWdlX2NsYXNzX2FuYWx5c2lzIjpbeyJkYXRhX2V4cG9ydCI6W3siZGVzdGluYXRpb24iOlt7InMzX2J1Y2tldF9kZXN0aW5hdGlvbiI6W3siYnVja2V0X2FjY291bnRfaWQiOiIiLCJidWNrZXRfYXJuIjoiYXJuOmF3czpzMzo6OmJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDMiLCJmb3JtYXQiOiJDU1YiLCJwcmVmaXgiOiIifV19XSwib3V0cHV0X3NjaGVtYV92ZXJzaW9uIjoiVl8xIn1dfV19",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_analytics_multiple/aws_s3_bucket_analytics_configuration-bucket-martin-test-drift3_Analytics_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3NfYW5hbHlzaXMiOlsibGlzdCIsWyJvYmplY3QiLHsiZGF0YV9leHBvcnQiOlsibGlzdCIsWyJvYmplY3QiLHsiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiczNfYnVja2V0X2Rlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImJ1Y2tldF9hY2NvdW50X2lkIjoic3RyaW5nIiwiYnVja2V0X2FybiI6InN0cmluZyIsImZvcm1hdCI6InN0cmluZyIsInByZWZpeCI6InN0cmluZyJ9XV19XV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6InN0cmluZyJ9XV19XV19XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiZmlsdGVyIjpbXSwiaWQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzOkFuYWx5dGljc19CdWNrZXQzIiwibmFtZSI6IkFuYWx5dGljc19CdWNrZXQzIiwic3RvcmFnZV9jbGFzc19hbmFseXNpcyI6W3siZGF0YV9leHBvcnQiOlt7ImRlc3RpbmF0aW9uIjpbeyJzM19idWNrZXRfZGVzdGluYXRpb24iOlt7ImJ1Y2tldF9hY2NvdW50X2lkIjoiIiwiYnVja2V0X2FybiI6ImFybjphd3M6czM6OjpidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiZm9ybWF0IjoiQ1NWIiwicHJlZml4IjoiIn1dfV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6IlZfMSJ9XX1dfQ==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_analytics_multiple/aws_s3_bucket_analytics_configuration-bucket-martin-test-drift_Analytics2_Bucket.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3NfYW5hbHlzaXMiOlsibGlzdCIsWyJvYmplY3QiLHsiZGF0YV9leHBvcnQiOlsibGlzdCIsWyJvYmplY3QiLHsiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiczNfYnVja2V0X2Rlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImJ1Y2tldF9hY2NvdW50X2lkIjoic3RyaW5nIiwiYnVja2V0X2FybiI6InN0cmluZyIsImZvcm1hdCI6InN0cmluZyIsInByZWZpeCI6InN0cmluZyJ9XV19XV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6InN0cmluZyJ9XV19XV19XQ==",
"Val": "bnVsbA==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_analytics_multiple/aws_s3_bucket_analytics_configuration-bucket-martin-test-drift_Analytics2_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3NfYW5hbHlzaXMiOlsibGlzdCIsWyJvYmplY3QiLHsiZGF0YV9leHBvcnQiOlsibGlzdCIsWyJvYmplY3QiLHsiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiczNfYnVja2V0X2Rlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImJ1Y2tldF9hY2NvdW50X2lkIjoic3RyaW5nIiwiYnVja2V0X2FybiI6InN0cmluZyIsImZvcm1hdCI6InN0cmluZyIsInByZWZpeCI6InN0cmluZyJ9XV19XV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6InN0cmluZyJ9XV19XV19XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJmaWx0ZXIiOltdLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDpBbmFseXRpY3MyX0J1Y2tldDEiLCJuYW1lIjoiQW5hbHl0aWNzMl9CdWNrZXQxIiwic3RvcmFnZV9jbGFzc19hbmFseXNpcyI6W3siZGF0YV9leHBvcnQiOlt7ImRlc3RpbmF0aW9uIjpbeyJzM19idWNrZXRfZGVzdGluYXRpb24iOlt7ImJ1Y2tldF9hY2NvdW50X2lkIjoiIiwiYnVja2V0X2FybiI6ImFybjphd3M6czM6OjpidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJmb3JtYXQiOiJDU1YiLCJwcmVmaXgiOiIifV19XSwib3V0cHV0X3NjaGVtYV92ZXJzaW9uIjoiVl8xIn1dfV19",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_analytics_multiple/aws_s3_bucket_analytics_configuration-bucket-martin-test-drift_Analytics_Bucket.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3NfYW5hbHlzaXMiOlsibGlzdCIsWyJvYmplY3QiLHsiZGF0YV9leHBvcnQiOlsibGlzdCIsWyJvYmplY3QiLHsiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiczNfYnVja2V0X2Rlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImJ1Y2tldF9hY2NvdW50X2lkIjoic3RyaW5nIiwiYnVja2V0X2FybiI6InN0cmluZyIsImZvcm1hdCI6InN0cmluZyIsInByZWZpeCI6InN0cmluZyJ9XV19XV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6InN0cmluZyJ9XV19XV19XQ==",
"Val": "bnVsbA==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_analytics_multiple/aws_s3_bucket_analytics_configuration-bucket-martin-test-drift_Analytics_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3NfYW5hbHlzaXMiOlsibGlzdCIsWyJvYmplY3QiLHsiZGF0YV9leHBvcnQiOlsibGlzdCIsWyJvYmplY3QiLHsiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiczNfYnVja2V0X2Rlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImJ1Y2tldF9hY2NvdW50X2lkIjoic3RyaW5nIiwiYnVja2V0X2FybiI6InN0cmluZyIsImZvcm1hdCI6InN0cmluZyIsInByZWZpeCI6InN0cmluZyJ9XV19XV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6InN0cmluZyJ9XV19XV19XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJmaWx0ZXIiOltdLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDpBbmFseXRpY3NfQnVja2V0MSIsIm5hbWUiOiJBbmFseXRpY3NfQnVja2V0MSIsInN0b3JhZ2VfY2xhc3NfYW5hbHlzaXMiOlt7ImRhdGFfZXhwb3J0IjpbeyJkZXN0aW5hdGlvbiI6W3siczNfYnVja2V0X2Rlc3RpbmF0aW9uIjpbeyJidWNrZXRfYWNjb3VudF9pZCI6IiIsImJ1Y2tldF9hcm4iOiJhcm46YXdzOnMzOjo6YnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0IiwiZm9ybWF0IjoiQ1NWIiwicHJlZml4IjoiIn1dfV0sIm91dHB1dF9zY2hlbWFfdmVyc2lvbiI6IlZfMSJ9XX1dfQ==",
"Err": null
}

108
pkg/remote/aws/test/s3_bucket_analytics_multiple/results.golden.json
View File

@ -52,113 +52,5 @@
] ]
} }
] ]
},
{
"bucket": "bucket-martin-test-drift",
"filter": [],
"id": "bucket-martin-test-drift:Analytics_Bucket1",
"name": "Analytics_Bucket1",
"storage_class_analysis": [
{
"data_export": [
{
"destination": [
{
"s3_bucket_destination": [
{
"bucket_account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift",
"format": "CSV",
"prefix": ""
}
]
}
],
"output_schema_version": "V_1"
}
]
}
]
},
{
"bucket": "bucket-martin-test-drift",
"filter": [],
"id": "bucket-martin-test-drift:Analytics2_Bucket1",
"name": "Analytics2_Bucket1",
"storage_class_analysis": [
{
"data_export": [
{
"destination": [
{
"s3_bucket_destination": [
{
"bucket_account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift",
"format": "CSV",
"prefix": ""
}
]
}
],
"output_schema_version": "V_1"
}
]
}
]
},
{
"bucket": "bucket-martin-test-drift3",
"filter": [],
"id": "bucket-martin-test-drift3:Analytics2_Bucket3",
"name": "Analytics2_Bucket3",
"storage_class_analysis": [
{
"data_export": [
{
"destination": [
{
"s3_bucket_destination": [
{
"bucket_account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift3",
"format": "CSV",
"prefix": ""
}
]
}
],
"output_schema_version": "V_1"
}
]
}
]
},
{
"bucket": "bucket-martin-test-drift3",
"filter": [],
"id": "bucket-martin-test-drift3:Analytics_Bucket3",
"name": "Analytics_Bucket3",
"storage_class_analysis": [
{
"data_export": [
{
"destination": [
{
"s3_bucket_destination": [
{
"bucket_account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift3",
"format": "CSV",
"prefix": ""
}
]
}
],
"output_schema_version": "V_1"
}
]
}
]
} }
] ]

5
pkg/remote/aws/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift3_Inventory2_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiYnVja2V0IjpbImxpc3QiLFsib2JqZWN0Iix7ImFjY291bnRfaWQiOiJzdHJpbmciLCJidWNrZXRfYXJuIjoic3RyaW5nIiwiZW5jcnlwdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJzc2Vfa21zIjpbImxpc3QiLFsib2JqZWN0Iix7ImtleV9pZCI6InN0cmluZyJ9XV0sInNzZV9zMyI6WyJsaXN0IixbIm9iamVjdCIse31dXX1dXSwiZm9ybWF0Ijoic3RyaW5nIiwicHJlZml4Ijoic3RyaW5nIn1dXX1dXSwiZW5hYmxlZCI6ImJvb2wiLCJmaWx0ZXIiOlsibGlzdCIsWyJvYmplY3QiLHsicHJlZml4Ijoic3RyaW5nIn1dXSwiaWQiOiJzdHJpbmciLCJpbmNsdWRlZF9vYmplY3RfdmVyc2lvbnMiOiJzdHJpbmciLCJuYW1lIjoic3RyaW5nIiwib3B0aW9uYWxfZmllbGRzIjpbInNldCIsInN0cmluZyJdLCJzY2hlZHVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJmcmVxdWVuY3kiOiJzdHJpbmcifV1dfV0=",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiZGVzdGluYXRpb24iOlt7ImJ1Y2tldCI6W3siYWNjb3VudF9pZCI6IiIsImJ1Y2tldF9hcm4iOiJhcm46YXdzOnMzOjo6YnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0MyIsImVuY3J5cHRpb24iOltdLCJmb3JtYXQiOiJPUkMiLCJwcmVmaXgiOiIifV19XSwiZW5hYmxlZCI6dHJ1ZSwiZmlsdGVyIjpbXSwiaWQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzOkludmVudG9yeTJfQnVja2V0MyIsImluY2x1ZGVkX29iamVjdF92ZXJzaW9ucyI6IkFsbCIsIm5hbWUiOiJJbnZlbnRvcnkyX0J1Y2tldDMiLCJvcHRpb25hbF9maWVsZHMiOltdLCJzY2hlZHVsZSI6W3siZnJlcXVlbmN5IjoiRGFpbHkifV19",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift3_Inventory_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiYnVja2V0IjpbImxpc3QiLFsib2JqZWN0Iix7ImFjY291bnRfaWQiOiJzdHJpbmciLCJidWNrZXRfYXJuIjoic3RyaW5nIiwiZW5jcnlwdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJzc2Vfa21zIjpbImxpc3QiLFsib2JqZWN0Iix7ImtleV9pZCI6InN0cmluZyJ9XV0sInNzZV9zMyI6WyJsaXN0IixbIm9iamVjdCIse31dXX1dXSwiZm9ybWF0Ijoic3RyaW5nIiwicHJlZml4Ijoic3RyaW5nIn1dXX1dXSwiZW5hYmxlZCI6ImJvb2wiLCJmaWx0ZXIiOlsibGlzdCIsWyJvYmplY3QiLHsicHJlZml4Ijoic3RyaW5nIn1dXSwiaWQiOiJzdHJpbmciLCJpbmNsdWRlZF9vYmplY3RfdmVyc2lvbnMiOiJzdHJpbmciLCJuYW1lIjoic3RyaW5nIiwib3B0aW9uYWxfZmllbGRzIjpbInNldCIsInN0cmluZyJdLCJzY2hlZHVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJmcmVxdWVuY3kiOiJzdHJpbmcifV1dfV0=",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiZGVzdGluYXRpb24iOlt7ImJ1Y2tldCI6W3siYWNjb3VudF9pZCI6IiIsImJ1Y2tldF9hcm4iOiJhcm46YXdzOnMzOjo6YnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0MyIsImVuY3J5cHRpb24iOltdLCJmb3JtYXQiOiJPUkMiLCJwcmVmaXgiOiIifV19XSwiZW5hYmxlZCI6dHJ1ZSwiZmlsdGVyIjpbXSwiaWQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzOkludmVudG9yeV9CdWNrZXQzIiwiaW5jbHVkZWRfb2JqZWN0X3ZlcnNpb25zIjoiQWxsIiwibmFtZSI6IkludmVudG9yeV9CdWNrZXQzIiwib3B0aW9uYWxfZmllbGRzIjpbXSwic2NoZWR1bGUiOlt7ImZyZXF1ZW5jeSI6IkRhaWx5In1dfQ==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift_Inventory2_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiYnVja2V0IjpbImxpc3QiLFsib2JqZWN0Iix7ImFjY291bnRfaWQiOiJzdHJpbmciLCJidWNrZXRfYXJuIjoic3RyaW5nIiwiZW5jcnlwdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJzc2Vfa21zIjpbImxpc3QiLFsib2JqZWN0Iix7ImtleV9pZCI6InN0cmluZyJ9XV0sInNzZV9zMyI6WyJsaXN0IixbIm9iamVjdCIse31dXX1dXSwiZm9ybWF0Ijoic3RyaW5nIiwicHJlZml4Ijoic3RyaW5nIn1dXX1dXSwiZW5hYmxlZCI6ImJvb2wiLCJmaWx0ZXIiOlsibGlzdCIsWyJvYmplY3QiLHsicHJlZml4Ijoic3RyaW5nIn1dXSwiaWQiOiJzdHJpbmciLCJpbmNsdWRlZF9vYmplY3RfdmVyc2lvbnMiOiJzdHJpbmciLCJuYW1lIjoic3RyaW5nIiwib3B0aW9uYWxfZmllbGRzIjpbInNldCIsInN0cmluZyJdLCJzY2hlZHVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJmcmVxdWVuY3kiOiJzdHJpbmcifV1dfV0=",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJkZXN0aW5hdGlvbiI6W3siYnVja2V0IjpbeyJhY2NvdW50X2lkIjoiIiwiYnVja2V0X2FybiI6ImFybjphd3M6czM6OjpidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJlbmNyeXB0aW9uIjpbXSwiZm9ybWF0IjoiT1JDIiwicHJlZml4IjoiIn1dfV0sImVuYWJsZWQiOnRydWUsImZpbHRlciI6W10sImlkIjoiYnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0OkludmVudG9yeTJfQnVja2V0MSIsImluY2x1ZGVkX29iamVjdF92ZXJzaW9ucyI6IkFsbCIsIm5hbWUiOiJJbnZlbnRvcnkyX0J1Y2tldDEiLCJvcHRpb25hbF9maWVsZHMiOltdLCJzY2hlZHVsZSI6W3siZnJlcXVlbmN5IjoiRGFpbHkifV19",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift_Inventory_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZGVzdGluYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiYnVja2V0IjpbImxpc3QiLFsib2JqZWN0Iix7ImFjY291bnRfaWQiOiJzdHJpbmciLCJidWNrZXRfYXJuIjoic3RyaW5nIiwiZW5jcnlwdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJzc2Vfa21zIjpbImxpc3QiLFsib2JqZWN0Iix7ImtleV9pZCI6InN0cmluZyJ9XV0sInNzZV9zMyI6WyJsaXN0IixbIm9iamVjdCIse31dXX1dXSwiZm9ybWF0Ijoic3RyaW5nIiwicHJlZml4Ijoic3RyaW5nIn1dXX1dXSwiZW5hYmxlZCI6ImJvb2wiLCJmaWx0ZXIiOlsibGlzdCIsWyJvYmplY3QiLHsicHJlZml4Ijoic3RyaW5nIn1dXSwiaWQiOiJzdHJpbmciLCJpbmNsdWRlZF9vYmplY3RfdmVyc2lvbnMiOiJzdHJpbmciLCJuYW1lIjoic3RyaW5nIiwib3B0aW9uYWxfZmllbGRzIjpbInNldCIsInN0cmluZyJdLCJzY2hlZHVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJmcmVxdWVuY3kiOiJzdHJpbmcifV1dfV0=",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJkZXN0aW5hdGlvbiI6W3siYnVja2V0IjpbeyJhY2NvdW50X2lkIjoiIiwiYnVja2V0X2FybiI6ImFybjphd3M6czM6OjpidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJlbmNyeXB0aW9uIjpbXSwiZm9ybWF0IjoiT1JDIiwicHJlZml4IjoiIn1dfV0sImVuYWJsZWQiOnRydWUsImZpbHRlciI6W10sImlkIjoiYnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0OkludmVudG9yeV9CdWNrZXQxIiwiaW5jbHVkZWRfb2JqZWN0X3ZlcnNpb25zIjoiQWxsIiwibmFtZSI6IkludmVudG9yeV9CdWNrZXQxIiwib3B0aW9uYWxfZmllbGRzIjpbXSwic2NoZWR1bGUiOlt7ImZyZXF1ZW5jeSI6IkRhaWx5In1dfQ==",
"Err": null
}

108
pkg/remote/aws/test/s3_bucket_inventories_multiple/results.golden.json
View File

@ -52,113 +52,5 @@
"frequency": "Daily" "frequency": "Daily"
} }
] ]
},
{
"bucket": "bucket-martin-test-drift",
"destination": [
{
"bucket": [
{
"account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift",
"encryption": [],
"format": "ORC",
"prefix": ""
}
]
}
],
"enabled": true,
"filter": [],
"id": "bucket-martin-test-drift:Inventory2_Bucket1",
"included_object_versions": "All",
"name": "Inventory2_Bucket1",
"optional_fields": [],
"schedule": [
{
"frequency": "Daily"
}
]
},
{
"bucket": "bucket-martin-test-drift",
"destination": [
{
"bucket": [
{
"account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift",
"encryption": [],
"format": "ORC",
"prefix": ""
}
]
}
],
"enabled": true,
"filter": [],
"id": "bucket-martin-test-drift:Inventory_Bucket1",
"included_object_versions": "All",
"name": "Inventory_Bucket1",
"optional_fields": [],
"schedule": [
{
"frequency": "Daily"
}
]
},
{
"bucket": "bucket-martin-test-drift3",
"destination": [
{
"bucket": [
{
"account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift3",
"encryption": [],
"format": "ORC",
"prefix": ""
}
]
}
],
"enabled": true,
"filter": [],
"id": "bucket-martin-test-drift3:Inventory_Bucket3",
"included_object_versions": "All",
"name": "Inventory_Bucket3",
"optional_fields": [],
"schedule": [
{
"frequency": "Daily"
}
]
},
{
"bucket": "bucket-martin-test-drift3",
"destination": [
{
"bucket": [
{
"account_id": "",
"bucket_arn": "arn:aws:s3:::bucket-martin-test-drift3",
"encryption": [],
"format": "ORC",
"prefix": ""
}
]
}
],
"enabled": true,
"filter": [],
"id": "bucket-martin-test-drift3:Inventory2_Bucket3",
"included_object_versions": "All",
"name": "Inventory2_Bucket3",
"optional_fields": [],
"schedule": [
{
"frequency": "Daily"
}
]
} }
] ]

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift3_Metric2_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "bnVsbA==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift3_Metric_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "bnVsbA==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift3_Metrics2_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiZmlsdGVyIjpudWxsLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDM6TWV0cmljczJfQnVja2V0MyIsIm5hbWUiOiJNZXRyaWNzMl9CdWNrZXQzIn0=",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift3_Metrics_Bucket3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiZmlsdGVyIjpudWxsLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDM6TWV0cmljc19CdWNrZXQzIiwibmFtZSI6Ik1ldHJpY3NfQnVja2V0MyJ9",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift_Metric2_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "bnVsbA==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift_Metric_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "bnVsbA==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift_Metrics2_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJmaWx0ZXIiOm51bGwsImlkIjoiYnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0Ok1ldHJpY3MyX0J1Y2tldDEiLCJuYW1lIjoiTWV0cmljczJfQnVja2V0MSJ9",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift_Metrics_Bucket1.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiZmlsdGVyIjpbImxpc3QiLFsib2JqZWN0Iix7InByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl19XV0sImlkIjoic3RyaW5nIiwibmFtZSI6InN0cmluZyJ9XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJmaWx0ZXIiOm51bGwsImlkIjoiYnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0Ok1ldHJpY3NfQnVja2V0MSIsIm5hbWUiOiJNZXRyaWNzX0J1Y2tldDEifQ==",
"Err": null
}

24
pkg/remote/aws/test/s3_bucket_metrics_multiple/results.golden.json
View File

@ -5,34 +5,10 @@
"id": "bucket-martin-test-drift2:Metrics2_Bucket2", "id": "bucket-martin-test-drift2:Metrics2_Bucket2",
"name": "Metrics2_Bucket2" "name": "Metrics2_Bucket2"
}, },
{
"bucket": "bucket-martin-test-drift",
"filter": null,
"id": "bucket-martin-test-drift:Metrics_Bucket1",
"name": "Metrics_Bucket1"
},
{ {
"bucket": "bucket-martin-test-drift2", "bucket": "bucket-martin-test-drift2",
"filter": null, "filter": null,
"id": "bucket-martin-test-drift2:Metrics_Bucket2", "id": "bucket-martin-test-drift2:Metrics_Bucket2",
"name": "Metrics_Bucket2" "name": "Metrics_Bucket2"
},
{
"bucket": "bucket-martin-test-drift",
"filter": null,
"id": "bucket-martin-test-drift:Metrics2_Bucket1",
"name": "Metrics2_Bucket1"
},
{
"bucket": "bucket-martin-test-drift3",
"filter": null,
"id": "bucket-martin-test-drift3:Metrics2_Bucket3",
"name": "Metrics2_Bucket3"
},
{
"bucket": "bucket-martin-test-drift3",
"filter": null,
"id": "bucket-martin-test-drift3:Metrics_Bucket3",
"name": "Metrics_Bucket3"
} }
] ]

5
pkg/remote/aws/test/s3_bucket_multiple/aws_s3_bucket-bucket-martin-test-drift.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYWNjZWxlcmF0aW9uX3N0YXR1cyI6InN0cmluZyIsImFjbCI6InN0cmluZyIsImFybiI6InN0cmluZyIsImJ1Y2tldCI6InN0cmluZyIsImJ1Y2tldF9kb21haW5fbmFtZSI6InN0cmluZyIsImJ1Y2tldF9wcmVmaXgiOiJzdHJpbmciLCJidWNrZXRfcmVnaW9uYWxfZG9tYWluX25hbWUiOiJzdHJpbmciLCJjb3JzX3J1bGUiOlsibGlzdCIsWyJvYmplY3QiLHsiYWxsb3dlZF9oZWFkZXJzIjpbImxpc3QiLCJzdHJpbmciXSwiYWxsb3dlZF9tZXRob2RzIjpbImxpc3QiLCJzdHJpbmciXSwiYWxsb3dlZF9vcmlnaW5zIjpbImxpc3QiLCJzdHJpbmciXSwiZXhwb3NlX2hlYWRlcnMiOlsibGlzdCIsInN0cmluZyJdLCJtYXhfYWdlX3NlY29uZHMiOiJudW1iZXIifV1dLCJmb3JjZV9kZXN0cm95IjoiYm9vbCIsImdyYW50IjpbInNldCIsWyJvYmplY3QiLHsiaWQiOiJzdHJpbmciLCJwZXJtaXNzaW9ucyI6WyJzZXQiLCJzdHJpbmciXSwidHlwZSI6InN0cmluZyIsInVyaSI6InN0cmluZyJ9XV0sImhvc3RlZF96b25lX2lkIjoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJsaWZlY3ljbGVfcnVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJhYm9ydF9pbmNvbXBsZXRlX211bHRpcGFydF91cGxvYWRfZGF5cyI6Im51bWJlciIsImVuYWJsZWQiOiJib29sIiwiZXhwaXJhdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJkYXRlIjoic3RyaW5nIiwiZGF5cyI6Im51bWJlciIsImV4cGlyZWRfb2JqZWN0X2RlbGV0ZV9tYXJrZXIiOiJib29sIn1dXSwiaWQiOiJzdHJpbmciLCJub25jdXJyZW50X3ZlcnNpb25fZXhwaXJhdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJkYXlzIjoibnVtYmVyIn1dXSwibm9uY3VycmVudF92ZXJzaW9uX3RyYW5zaXRpb24iOlsic2V0IixbIm9iamVjdCIseyJkYXlzIjoibnVtYmVyIiwic3RvcmFnZV9jbGFzcyI6InN0cmluZyJ9XV0sInByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl0sInRyYW5zaXRpb24iOlsic2V0IixbIm9iamVjdCIseyJkYXRlIjoic3RyaW5nIiwiZGF5cyI6Im51bWJlciIsInN0b3JhZ2VfY2xhc3MiOiJzdHJpbmcifV1dfV1dLCJsb2dnaW5nIjpbInNldCIsWyJvYmplY3QiLHsidGFyZ2V0X2J1Y2tldCI6InN0cmluZyIsInRhcmdldF9wcmVmaXgiOiJzdHJpbmcifV1dLCJvYmplY3RfbG9ja19jb25maWd1cmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7Im9iamVjdF9sb2NrX2VuYWJsZWQiOiJzdHJpbmciLCJydWxlIjpbImxpc3QiLFsib2JqZWN0Iix7ImRlZmF1bHRfcmV0ZW50aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImRheXMiOiJudW1iZXIiLCJtb2RlIjoic3RyaW5nIiwieWVhcnMiOiJudW1iZXIifV1dfV1dfV1dLCJwb2xpY3kiOiJzdHJpbmciLCJyZWdpb24iOiJzdHJpbmciLCJyZXBsaWNhdGlvbl9jb25maWd1cmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7InJvbGUiOiJzdHJpbmciLCJydWxlcyI6WyJzZXQiLFsib2JqZWN0Iix7ImRlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImFjY2Vzc19jb250cm9sX3RyYW5zbGF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7Im93bmVyIjoic3RyaW5nIn1dXSwiYWNjb3VudF9pZCI6InN0cmluZyIsImJ1Y2tldCI6InN0cmluZyIsInJlcGxpY2Ffa21zX2tleV9pZCI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3MiOiJzdHJpbmcifV1dLCJmaWx0ZXIiOlsibGlzdCIsWyJvYmplY3QiLHsicHJlZml4Ijoic3RyaW5nIiwidGFncyI6WyJtYXAiLCJzdHJpbmciXX1dXSwiaWQiOiJzdHJpbmciLCJwcmVmaXgiOiJzdHJpbmciLCJwcmlvcml0eSI6Im51bWJlciIsInNvdXJjZV9zZWxlY3Rpb25fY3JpdGVyaWEiOlsibGlzdCIsWyJvYmplY3QiLHsic3NlX2ttc19lbmNyeXB0ZWRfb2JqZWN0cyI6WyJsaXN0IixbIm9iamVjdCIseyJlbmFibGVkIjoiYm9vbCJ9XV19XV0sInN0YXR1cyI6InN0cmluZyJ9XV19XV0sInJlcXVlc3RfcGF5ZXIiOiJzdHJpbmciLCJzZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2NvbmZpZ3VyYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsicnVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJhcHBseV9zZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2J5X2RlZmF1bHQiOlsibGlzdCIsWyJvYmplY3QiLHsia21zX21hc3Rlcl9rZXlfaWQiOiJzdHJpbmciLCJzc2VfYWxnb3JpdGhtIjoic3RyaW5nIn1dXX1dXX1dXSwidGFncyI6WyJtYXAiLCJzdHJpbmciXSwidmVyc2lvbmluZyI6WyJsaXN0IixbIm9iamVjdCIseyJlbmFibGVkIjoiYm9vbCIsIm1mYV9kZWxldGUiOiJib29sIn1dXSwid2Vic2l0ZSI6WyJsaXN0IixbIm9iamVjdCIseyJlcnJvcl9kb2N1bWVudCI6InN0cmluZyIsImluZGV4X2RvY3VtZW50Ijoic3RyaW5nIiwicmVkaXJlY3RfYWxsX3JlcXVlc3RzX3RvIjoic3RyaW5nIiwicm91dGluZ19ydWxlcyI6InN0cmluZyJ9XV0sIndlYnNpdGVfZG9tYWluIjoic3RyaW5nIiwid2Vic2l0ZV9lbmRwb2ludCI6InN0cmluZyJ9XQ==",
"Val": "eyJhY2NlbGVyYXRpb25fc3RhdHVzIjoiIiwiYWNsIjpudWxsLCJhcm4iOiJhcm46YXdzOnMzOjo6YnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0IiwiYnVja2V0IjoiYnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0IiwiYnVja2V0X2RvbWFpbl9uYW1lIjoiYnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0LnMzLmFtYXpvbmF3cy5jb20iLCJidWNrZXRfcHJlZml4IjpudWxsLCJidWNrZXRfcmVnaW9uYWxfZG9tYWluX25hbWUiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQuczMuZXUtd2VzdC0xLmFtYXpvbmF3cy5jb20iLCJjb3JzX3J1bGUiOltdLCJmb3JjZV9kZXN0cm95IjpudWxsLCJncmFudCI6W10sImhvc3RlZF96b25lX2lkIjoiWjFCS0NUWEQ3NEVaUEUiLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdCIsImxpZmVjeWNsZV9ydWxlIjpbXSwibG9nZ2luZyI6W10sIm9iamVjdF9sb2NrX2NvbmZpZ3VyYXRpb24iOltdLCJwb2xpY3kiOm51bGwsInJlZ2lvbiI6ImV1LXdlc3QtMSIsInJlcGxpY2F0aW9uX2NvbmZpZ3VyYXRpb24iOltdLCJyZXF1ZXN0X3BheWVyIjoiQnVja2V0T3duZXIiLCJzZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2NvbmZpZ3VyYXRpb24iOltdLCJ0YWdzIjp7fSwidmVyc2lvbmluZyI6W3siZW5hYmxlZCI6ZmFsc2UsIm1mYV9kZWxldGUiOmZhbHNlfV0sIndlYnNpdGUiOltdLCJ3ZWJzaXRlX2RvbWFpbiI6bnVsbCwid2Vic2l0ZV9lbmRwb2ludCI6bnVsbH0=",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_multiple/aws_s3_bucket-bucket-martin-test-drift3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYWNjZWxlcmF0aW9uX3N0YXR1cyI6InN0cmluZyIsImFjbCI6InN0cmluZyIsImFybiI6InN0cmluZyIsImJ1Y2tldCI6InN0cmluZyIsImJ1Y2tldF9kb21haW5fbmFtZSI6InN0cmluZyIsImJ1Y2tldF9wcmVmaXgiOiJzdHJpbmciLCJidWNrZXRfcmVnaW9uYWxfZG9tYWluX25hbWUiOiJzdHJpbmciLCJjb3JzX3J1bGUiOlsibGlzdCIsWyJvYmplY3QiLHsiYWxsb3dlZF9oZWFkZXJzIjpbImxpc3QiLCJzdHJpbmciXSwiYWxsb3dlZF9tZXRob2RzIjpbImxpc3QiLCJzdHJpbmciXSwiYWxsb3dlZF9vcmlnaW5zIjpbImxpc3QiLCJzdHJpbmciXSwiZXhwb3NlX2hlYWRlcnMiOlsibGlzdCIsInN0cmluZyJdLCJtYXhfYWdlX3NlY29uZHMiOiJudW1iZXIifV1dLCJmb3JjZV9kZXN0cm95IjoiYm9vbCIsImdyYW50IjpbInNldCIsWyJvYmplY3QiLHsiaWQiOiJzdHJpbmciLCJwZXJtaXNzaW9ucyI6WyJzZXQiLCJzdHJpbmciXSwidHlwZSI6InN0cmluZyIsInVyaSI6InN0cmluZyJ9XV0sImhvc3RlZF96b25lX2lkIjoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJsaWZlY3ljbGVfcnVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJhYm9ydF9pbmNvbXBsZXRlX211bHRpcGFydF91cGxvYWRfZGF5cyI6Im51bWJlciIsImVuYWJsZWQiOiJib29sIiwiZXhwaXJhdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJkYXRlIjoic3RyaW5nIiwiZGF5cyI6Im51bWJlciIsImV4cGlyZWRfb2JqZWN0X2RlbGV0ZV9tYXJrZXIiOiJib29sIn1dXSwiaWQiOiJzdHJpbmciLCJub25jdXJyZW50X3ZlcnNpb25fZXhwaXJhdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJkYXlzIjoibnVtYmVyIn1dXSwibm9uY3VycmVudF92ZXJzaW9uX3RyYW5zaXRpb24iOlsic2V0IixbIm9iamVjdCIseyJkYXlzIjoibnVtYmVyIiwic3RvcmFnZV9jbGFzcyI6InN0cmluZyJ9XV0sInByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl0sInRyYW5zaXRpb24iOlsic2V0IixbIm9iamVjdCIseyJkYXRlIjoic3RyaW5nIiwiZGF5cyI6Im51bWJlciIsInN0b3JhZ2VfY2xhc3MiOiJzdHJpbmcifV1dfV1dLCJsb2dnaW5nIjpbInNldCIsWyJvYmplY3QiLHsidGFyZ2V0X2J1Y2tldCI6InN0cmluZyIsInRhcmdldF9wcmVmaXgiOiJzdHJpbmcifV1dLCJvYmplY3RfbG9ja19jb25maWd1cmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7Im9iamVjdF9sb2NrX2VuYWJsZWQiOiJzdHJpbmciLCJydWxlIjpbImxpc3QiLFsib2JqZWN0Iix7ImRlZmF1bHRfcmV0ZW50aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImRheXMiOiJudW1iZXIiLCJtb2RlIjoic3RyaW5nIiwieWVhcnMiOiJudW1iZXIifV1dfV1dfV1dLCJwb2xpY3kiOiJzdHJpbmciLCJyZWdpb24iOiJzdHJpbmciLCJyZXBsaWNhdGlvbl9jb25maWd1cmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7InJvbGUiOiJzdHJpbmciLCJydWxlcyI6WyJzZXQiLFsib2JqZWN0Iix7ImRlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImFjY2Vzc19jb250cm9sX3RyYW5zbGF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7Im93bmVyIjoic3RyaW5nIn1dXSwiYWNjb3VudF9pZCI6InN0cmluZyIsImJ1Y2tldCI6InN0cmluZyIsInJlcGxpY2Ffa21zX2tleV9pZCI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3MiOiJzdHJpbmcifV1dLCJmaWx0ZXIiOlsibGlzdCIsWyJvYmplY3QiLHsicHJlZml4Ijoic3RyaW5nIiwidGFncyI6WyJtYXAiLCJzdHJpbmciXX1dXSwiaWQiOiJzdHJpbmciLCJwcmVmaXgiOiJzdHJpbmciLCJwcmlvcml0eSI6Im51bWJlciIsInNvdXJjZV9zZWxlY3Rpb25fY3JpdGVyaWEiOlsibGlzdCIsWyJvYmplY3QiLHsic3NlX2ttc19lbmNyeXB0ZWRfb2JqZWN0cyI6WyJsaXN0IixbIm9iamVjdCIseyJlbmFibGVkIjoiYm9vbCJ9XV19XV0sInN0YXR1cyI6InN0cmluZyJ9XV19XV0sInJlcXVlc3RfcGF5ZXIiOiJzdHJpbmciLCJzZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2NvbmZpZ3VyYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsicnVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJhcHBseV9zZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2J5X2RlZmF1bHQiOlsibGlzdCIsWyJvYmplY3QiLHsia21zX21hc3Rlcl9rZXlfaWQiOiJzdHJpbmciLCJzc2VfYWxnb3JpdGhtIjoic3RyaW5nIn1dXX1dXX1dXSwidGFncyI6WyJtYXAiLCJzdHJpbmciXSwidmVyc2lvbmluZyI6WyJsaXN0IixbIm9iamVjdCIseyJlbmFibGVkIjoiYm9vbCIsIm1mYV9kZWxldGUiOiJib29sIn1dXSwid2Vic2l0ZSI6WyJsaXN0IixbIm9iamVjdCIseyJlcnJvcl9kb2N1bWVudCI6InN0cmluZyIsImluZGV4X2RvY3VtZW50Ijoic3RyaW5nIiwicmVkaXJlY3RfYWxsX3JlcXVlc3RzX3RvIjoic3RyaW5nIiwicm91dGluZ19ydWxlcyI6InN0cmluZyJ9XV0sIndlYnNpdGVfZG9tYWluIjoic3RyaW5nIiwid2Vic2l0ZV9lbmRwb2ludCI6InN0cmluZyJ9XQ==",
"Val": "eyJhY2NlbGVyYXRpb25fc3RhdHVzIjoiIiwiYWNsIjpudWxsLCJhcm4iOiJhcm46YXdzOnMzOjo6YnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0MyIsImJ1Y2tldCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDMiLCJidWNrZXRfZG9tYWluX25hbWUiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzLnMzLmFtYXpvbmF3cy5jb20iLCJidWNrZXRfcHJlZml4IjpudWxsLCJidWNrZXRfcmVnaW9uYWxfZG9tYWluX25hbWUiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzLnMzLmFwLW5vcnRoZWFzdC0xLmFtYXpvbmF3cy5jb20iLCJjb3JzX3J1bGUiOltdLCJmb3JjZV9kZXN0cm95IjpudWxsLCJncmFudCI6W10sImhvc3RlZF96b25lX2lkIjoiWjJNNEVIVVIyNlA3WlciLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDMiLCJsaWZlY3ljbGVfcnVsZSI6W10sImxvZ2dpbmciOltdLCJvYmplY3RfbG9ja19jb25maWd1cmF0aW9uIjpbXSwicG9saWN5IjpudWxsLCJyZWdpb24iOiJhcC1ub3J0aGVhc3QtMSIsInJlcGxpY2F0aW9uX2NvbmZpZ3VyYXRpb24iOltdLCJyZXF1ZXN0X3BheWVyIjoiQnVja2V0T3duZXIiLCJzZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2NvbmZpZ3VyYXRpb24iOltdLCJ0YWdzIjp7fSwidmVyc2lvbmluZyI6W3siZW5hYmxlZCI6ZmFsc2UsIm1mYV9kZWxldGUiOmZhbHNlfV0sIndlYnNpdGUiOltdLCJ3ZWJzaXRlX2RvbWFpbiI6bnVsbCwid2Vic2l0ZV9lbmRwb2ludCI6bnVsbH0=",
"Err": null
}

128
pkg/remote/aws/test/s3_bucket_multiple/results.golden.json
View File

@ -1,98 +1,34 @@
[ [
{ {
"acceleration_status": "", "acceleration_status": "",
"acl": null, "acl": null,
"arn": "arn:aws:s3:::bucket-martin-test-drift2", "arn": "arn:aws:s3:::bucket-martin-test-drift2",
"bucket": "bucket-martin-test-drift2", "bucket": "bucket-martin-test-drift2",
"bucket_domain_name": "bucket-martin-test-drift2.s3.amazonaws.com", "bucket_domain_name": "bucket-martin-test-drift2.s3.amazonaws.com",
"bucket_prefix": null, "bucket_prefix": null,
"bucket_regional_domain_name": "bucket-martin-test-drift2.s3.eu-west-3.amazonaws.com", "bucket_regional_domain_name": "bucket-martin-test-drift2.s3.eu-west-3.amazonaws.com",
"cors_rule": [], "cors_rule": [],
"force_destroy": null, "force_destroy": null,
"grant": [], "grant": [],
"hosted_zone_id": "Z3R1K369G5AVDG", "hosted_zone_id": "Z3R1K369G5AVDG",
"id": "bucket-martin-test-drift2", "id": "bucket-martin-test-drift2",
"lifecycle_rule": [], "lifecycle_rule": [],
"logging": [], "logging": [],
"object_lock_configuration": [], "object_lock_configuration": [],
"policy": null, "policy": null,
"region": "eu-west-3", "region": "eu-west-3",
"replication_configuration": [], "replication_configuration": [],
"request_payer": "BucketOwner", "request_payer": "BucketOwner",
"server_side_encryption_configuration": [], "server_side_encryption_configuration": [],
"tags": {}, "tags": {},
"versioning": [ "versioning": [
{ {
"enabled": false, "enabled": false,
"mfa_delete": false "mfa_delete": false
} }
], ],
"website": [], "website": [],
"website_domain": null, "website_domain": null,
"website_endpoint": null "website_endpoint": null
}, }
{
"acceleration_status": "",
"acl": null,
"arn": "arn:aws:s3:::bucket-martin-test-drift",
"bucket": "bucket-martin-test-drift",
"bucket_domain_name": "bucket-martin-test-drift.s3.amazonaws.com",
"bucket_prefix": null,
"bucket_regional_domain_name": "bucket-martin-test-drift.s3.eu-west-1.amazonaws.com",
"cors_rule": [],
"force_destroy": null,
"grant": [],
"hosted_zone_id": "Z1BKCTXD74EZPE",
"id": "bucket-martin-test-drift",
"lifecycle_rule": [],
"logging": [],
"object_lock_configuration": [],
"policy": null,
"region": "eu-west-1",
"replication_configuration": [],
"request_payer": "BucketOwner",
"server_side_encryption_configuration": [],
"tags": {},
"versioning": [
{
"enabled": false,
"mfa_delete": false
}
],
"website": [],
"website_domain": null,
"website_endpoint": null
},
{
"acceleration_status": "",
"acl": null,
"arn": "arn:aws:s3:::bucket-martin-test-drift3",
"bucket": "bucket-martin-test-drift3",
"bucket_domain_name": "bucket-martin-test-drift3.s3.amazonaws.com",
"bucket_prefix": null,
"bucket_regional_domain_name": "bucket-martin-test-drift3.s3.ap-northeast-1.amazonaws.com",
"cors_rule": [],
"force_destroy": null,
"grant": [],
"hosted_zone_id": "Z2M4EHUR26P7ZW",
"id": "bucket-martin-test-drift3",
"lifecycle_rule": [],
"logging": [],
"object_lock_configuration": [],
"policy": null,
"region": "ap-northeast-1",
"replication_configuration": [],
"request_payer": "BucketOwner",
"server_side_encryption_configuration": [],
"tags": {},
"versioning": [
{
"enabled": false,
"mfa_delete": false
}
],
"website": [],
"website_domain": null,
"website_endpoint": null
}
] ]

5
pkg/remote/aws/test/s3_bucket_notifications_multiple/aws_s3_bucket_notification-bucket-martin-test-drift.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJsYW1iZGFfZnVuY3Rpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiZXZlbnRzIjpbInNldCIsInN0cmluZyJdLCJmaWx0ZXJfcHJlZml4Ijoic3RyaW5nIiwiZmlsdGVyX3N1ZmZpeCI6InN0cmluZyIsImlkIjoic3RyaW5nIiwibGFtYmRhX2Z1bmN0aW9uX2FybiI6InN0cmluZyJ9XV0sInF1ZXVlIjpbImxpc3QiLFsib2JqZWN0Iix7ImV2ZW50cyI6WyJzZXQiLCJzdHJpbmciXSwiZmlsdGVyX3ByZWZpeCI6InN0cmluZyIsImZpbHRlcl9zdWZmaXgiOiJzdHJpbmciLCJpZCI6InN0cmluZyIsInF1ZXVlX2FybiI6InN0cmluZyJ9XV0sInRvcGljIjpbImxpc3QiLFsib2JqZWN0Iix7ImV2ZW50cyI6WyJzZXQiLCJzdHJpbmciXSwiZmlsdGVyX3ByZWZpeCI6InN0cmluZyIsImZpbHRlcl9zdWZmaXgiOiJzdHJpbmciLCJpZCI6InN0cmluZyIsInRvcGljX2FybiI6InN0cmluZyJ9XV19XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdCIsImxhbWJkYV9mdW5jdGlvbiI6W3siZXZlbnRzIjpbInMzOk9iamVjdENyZWF0ZWQ6KiJdLCJmaWx0ZXJfcHJlZml4IjoiQVdTTG9ncy8iLCJmaWx0ZXJfc3VmZml4IjoiLmxvZyIsImlkIjoidGYtczMtbGFtYmRhLTIwMjAxMTAzMTUzNDUyNTkyNzAwMDAwMDAxIiwibGFtYmRhX2Z1bmN0aW9uX2FybiI6ImFybjphd3M6bGFtYmRhOmV1LXdlc3QtMTo1MjY5NTQ5Mjk5MjM6ZnVuY3Rpb246ZXhhbXBsZV9sYW1iZGFfbmFtZTEifSx7ImV2ZW50cyI6WyJzMzpPYmplY3RDcmVhdGVkOioiXSwiZmlsdGVyX3ByZWZpeCI6Ik90aGVyTG9ncy8iLCJmaWx0ZXJfc3VmZml4IjoiLmxvZyIsImlkIjoidGYtczMtbGFtYmRhLTIwMjAxMTAzMTUzNDUyNTkyODAwMDAwMDAyIiwibGFtYmRhX2Z1bmN0aW9uX2FybiI6ImFybjphd3M6bGFtYmRhOmV1LXdlc3QtMTo1MjY5NTQ5Mjk5MjM6ZnVuY3Rpb246ZXhhbXBsZV9sYW1iZGFfbmFtZTIifV0sInF1ZXVlIjpbXSwidG9waWMiOltdfQ==",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_notifications_multiple/aws_s3_bucket_notification-bucket-martin-test-drift3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJsYW1iZGFfZnVuY3Rpb24iOlsibGlzdCIsWyJvYmplY3QiLHsiZXZlbnRzIjpbInNldCIsInN0cmluZyJdLCJmaWx0ZXJfcHJlZml4Ijoic3RyaW5nIiwiZmlsdGVyX3N1ZmZpeCI6InN0cmluZyIsImlkIjoic3RyaW5nIiwibGFtYmRhX2Z1bmN0aW9uX2FybiI6InN0cmluZyJ9XV0sInF1ZXVlIjpbImxpc3QiLFsib2JqZWN0Iix7ImV2ZW50cyI6WyJzZXQiLCJzdHJpbmciXSwiZmlsdGVyX3ByZWZpeCI6InN0cmluZyIsImZpbHRlcl9zdWZmaXgiOiJzdHJpbmciLCJpZCI6InN0cmluZyIsInF1ZXVlX2FybiI6InN0cmluZyJ9XV0sInRvcGljIjpbImxpc3QiLFsib2JqZWN0Iix7ImV2ZW50cyI6WyJzZXQiLCJzdHJpbmciXSwiZmlsdGVyX3ByZWZpeCI6InN0cmluZyIsImZpbHRlcl9zdWZmaXgiOiJzdHJpbmciLCJpZCI6InN0cmluZyIsInRvcGljX2FybiI6InN0cmluZyJ9XV19XQ==",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiaWQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwibGFtYmRhX2Z1bmN0aW9uIjpbeyJldmVudHMiOlsiczM6T2JqZWN0Q3JlYXRlZDoqIl0sImZpbHRlcl9wcmVmaXgiOiJBV1NMb2dzLyIsImZpbHRlcl9zdWZmaXgiOiIubG9nIiwiaWQiOiJ0Zi1zMy1sYW1iZGEtMjAyMDExMDMxNjUwNTI5NTgzMDAwMDAwMDEiLCJsYW1iZGFfZnVuY3Rpb25fYXJuIjoiYXJuOmF3czpsYW1iZGE6YXAtbm9ydGhlYXN0LTE6NTI2OTU0OTI5OTIzOmZ1bmN0aW9uOmV4YW1wbGVfbGFtYmRhX25hbWUxIn0seyJldmVudHMiOlsiczM6T2JqZWN0Q3JlYXRlZDoqIl0sImZpbHRlcl9wcmVmaXgiOiJPdGhlckxvZ3MvIiwiZmlsdGVyX3N1ZmZpeCI6Ii5sb2ciLCJpZCI6InRmLXMzLWxhbWJkYS0yMDIwMTEwMzE2NTA1Mjk1ODQwMDAwMDAwMiIsImxhbWJkYV9mdW5jdGlvbl9hcm4iOiJhcm46YXdzOmxhbWJkYTphcC1ub3J0aGVhc3QtMTo1MjY5NTQ5Mjk5MjM6ZnVuY3Rpb246ZXhhbXBsZV9sYW1iZGFfbmFtZTIifV0sInF1ZXVlIjpbXSwidG9waWMiOltdfQ==",
"Err": null
}

52
pkg/remote/aws/test/s3_bucket_notifications_multiple/results.golden.json
View File

@ -1,30 +1,4 @@
[ [
{
"bucket": "bucket-martin-test-drift",
"id": "bucket-martin-test-drift",
"lambda_function": [
{
"events": [
"s3:ObjectCreated:*"
],
"filter_prefix": "AWSLogs/",
"filter_suffix": ".log",
"id": "tf-s3-lambda-20201103153452592700000001",
"lambda_function_arn": "arn:aws:lambda:eu-west-1:526954929923:function:example_lambda_name1"
},
{
"events": [
"s3:ObjectCreated:*"
],
"filter_prefix": "OtherLogs/",
"filter_suffix": ".log",
"id": "tf-s3-lambda-20201103153452592800000002",
"lambda_function_arn": "arn:aws:lambda:eu-west-1:526954929923:function:example_lambda_name2"
}
],
"queue": [],
"topic": []
},
{ {
"bucket": "bucket-martin-test-drift2", "bucket": "bucket-martin-test-drift2",
"id": "bucket-martin-test-drift2", "id": "bucket-martin-test-drift2",
@ -50,31 +24,5 @@
], ],
"queue": [], "queue": [],
"topic": [] "topic": []
},
{
"bucket": "bucket-martin-test-drift3",
"id": "bucket-martin-test-drift3",
"lambda_function": [
{
"events": [
"s3:ObjectCreated:*"
],
"filter_prefix": "AWSLogs/",
"filter_suffix": ".log",
"id": "tf-s3-lambda-20201103165052958300000001",
"lambda_function_arn": "arn:aws:lambda:ap-northeast-1:526954929923:function:example_lambda_name1"
},
{
"events": [
"s3:ObjectCreated:*"
],
"filter_prefix": "OtherLogs/",
"filter_suffix": ".log",
"id": "tf-s3-lambda-20201103165052958400000002",
"lambda_function_arn": "arn:aws:lambda:ap-northeast-1:526954929923:function:example_lambda_name2"
}
],
"queue": [],
"topic": []
} }
] ]

5
pkg/remote/aws/test/s3_bucket_policies_multiple/aws_s3_bucket_policy-bucket-martin-test-drift.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJwb2xpY3kiOiJzdHJpbmcifV0=",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQiLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdCIsInBvbGljeSI6IntcIlZlcnNpb25cIjpcIjIwMTItMTAtMTdcIixcIlN0YXRlbWVudFwiOlt7XCJTaWRcIjpcIlB1YmxpY1JlYWRHZXRPYmplY3RcIixcIkVmZmVjdFwiOlwiQWxsb3dcIixcIlByaW5jaXBhbFwiOlwiKlwiLFwiQWN0aW9uXCI6XCJzMzpHZXRPYmplY3RcIixcIlJlc291cmNlXCI6XCJhcm46YXdzOnMzOjo6YnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0LypcIn1dfSJ9",
"Err": null
}

5
pkg/remote/aws/test/s3_bucket_policies_multiple/aws_s3_bucket_policy-bucket-martin-test-drift3.res.golden.json
View File

@ -1,5 +0,0 @@
{
"Typ": "WyJvYmplY3QiLHsiYnVja2V0Ijoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJwb2xpY3kiOiJzdHJpbmcifV0=",
"Val": "eyJidWNrZXQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwiaWQiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzIiwicG9saWN5Ijoie1wiVmVyc2lvblwiOlwiMjAxMi0xMC0xN1wiLFwiU3RhdGVtZW50XCI6W3tcIlNpZFwiOlwiUHVibGljUmVhZEdldE9iamVjdFwiLFwiRWZmZWN0XCI6XCJBbGxvd1wiLFwiUHJpbmNpcGFsXCI6XCIqXCIsXCJBY3Rpb25cIjpcInMzOkdldE9iamVjdFwiLFwiUmVzb3VyY2VcIjpcImFybjphd3M6czM6OjpidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzLypcIn1dfSJ9",
"Err": null
}

10
pkg/remote/aws/test/s3_bucket_policies_multiple/results.golden.json
View File

@ -3,15 +3,5 @@
"bucket": "bucket-martin-test-drift2", "bucket": "bucket-martin-test-drift2",
"id": "bucket-martin-test-drift2", "id": "bucket-martin-test-drift2",
"policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"PublicReadGetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift2/*\"}]}" "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"PublicReadGetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift2/*\"}]}"
},
{
"bucket": "bucket-martin-test-drift3",
"id": "bucket-martin-test-drift3",
"policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"PublicReadGetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift3/*\"}]}"
},
{
"bucket": "bucket-martin-test-drift",
"id": "bucket-martin-test-drift",
"policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"PublicReadGetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift/*\"}]}"
} }
] ]