From 2c2a9281d9da921f85d5495dd06087fa28f1ce2a Mon Sep 17 00:00:00 2001 From: sundowndev Date: Wed, 17 Mar 2021 19:52:04 +0100 Subject: [PATCH] test: update s3 bucket golden result --- pkg/remote/aws/s3_bucket_supplier_test.go | 11 +- ...-bucket-martin-test-drift3.res.golden.json | 5 - .../s3_bucket_multiple/results.golden.json | 160 +++++++----------- 3 files changed, 74 insertions(+), 102 deletions(-) delete mode 100755 pkg/remote/aws/test/s3_bucket_multiple/aws_s3_bucket-bucket-martin-test-drift3.res.golden.json diff --git a/pkg/remote/aws/s3_bucket_supplier_test.go b/pkg/remote/aws/s3_bucket_supplier_test.go index 0ea1bd30..353755dc 100644 --- a/pkg/remote/aws/s3_bucket_supplier_test.go +++ b/pkg/remote/aws/s3_bucket_supplier_test.go @@ -40,6 +40,7 @@ func TestS3BucketSupplier_Resources(t *testing.T) { {Name: awssdk.String("bucket-martin-test-drift")}, {Name: awssdk.String("bucket-martin-test-drift2")}, {Name: awssdk.String("bucket-martin-test-drift3")}, + {Name: awssdk.String("bucket-martin-test-drift4")}, }, nil) repository.On( @@ -52,7 +53,7 @@ func TestS3BucketSupplier_Resources(t *testing.T) { repository.On( "GetBucketLocation", - &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")}, + &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift4")}, ).Return( "eu-west-3", nil, @@ -65,6 +66,14 @@ func TestS3BucketSupplier_Resources(t *testing.T) { "ap-northeast-1", nil, ) + + repository.On( + "GetBucketLocation", + &s3.Bucket{Name: awssdk.String("bucket-martin-test-drift2")}, + ).Return( + "eu-west-1", + nil, + ) }, }, { diff --git a/pkg/remote/aws/test/s3_bucket_multiple/aws_s3_bucket-bucket-martin-test-drift3.res.golden.json b/pkg/remote/aws/test/s3_bucket_multiple/aws_s3_bucket-bucket-martin-test-drift3.res.golden.json deleted file mode 100755 index e9076839..00000000 --- a/pkg/remote/aws/test/s3_bucket_multiple/aws_s3_bucket-bucket-martin-test-drift3.res.golden.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Typ": "WyJvYmplY3QiLHsiYWNjZWxlcmF0aW9uX3N0YXR1cyI6InN0cmluZyIsImFjbCI6InN0cmluZyIsImFybiI6InN0cmluZyIsImJ1Y2tldCI6InN0cmluZyIsImJ1Y2tldF9kb21haW5fbmFtZSI6InN0cmluZyIsImJ1Y2tldF9wcmVmaXgiOiJzdHJpbmciLCJidWNrZXRfcmVnaW9uYWxfZG9tYWluX25hbWUiOiJzdHJpbmciLCJjb3JzX3J1bGUiOlsibGlzdCIsWyJvYmplY3QiLHsiYWxsb3dlZF9oZWFkZXJzIjpbImxpc3QiLCJzdHJpbmciXSwiYWxsb3dlZF9tZXRob2RzIjpbImxpc3QiLCJzdHJpbmciXSwiYWxsb3dlZF9vcmlnaW5zIjpbImxpc3QiLCJzdHJpbmciXSwiZXhwb3NlX2hlYWRlcnMiOlsibGlzdCIsInN0cmluZyJdLCJtYXhfYWdlX3NlY29uZHMiOiJudW1iZXIifV1dLCJmb3JjZV9kZXN0cm95IjoiYm9vbCIsImdyYW50IjpbInNldCIsWyJvYmplY3QiLHsiaWQiOiJzdHJpbmciLCJwZXJtaXNzaW9ucyI6WyJzZXQiLCJzdHJpbmciXSwidHlwZSI6InN0cmluZyIsInVyaSI6InN0cmluZyJ9XV0sImhvc3RlZF96b25lX2lkIjoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJsaWZlY3ljbGVfcnVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJhYm9ydF9pbmNvbXBsZXRlX211bHRpcGFydF91cGxvYWRfZGF5cyI6Im51bWJlciIsImVuYWJsZWQiOiJib29sIiwiZXhwaXJhdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJkYXRlIjoic3RyaW5nIiwiZGF5cyI6Im51bWJlciIsImV4cGlyZWRfb2JqZWN0X2RlbGV0ZV9tYXJrZXIiOiJib29sIn1dXSwiaWQiOiJzdHJpbmciLCJub25jdXJyZW50X3ZlcnNpb25fZXhwaXJhdGlvbiI6WyJsaXN0IixbIm9iamVjdCIseyJkYXlzIjoibnVtYmVyIn1dXSwibm9uY3VycmVudF92ZXJzaW9uX3RyYW5zaXRpb24iOlsic2V0IixbIm9iamVjdCIseyJkYXlzIjoibnVtYmVyIiwic3RvcmFnZV9jbGFzcyI6InN0cmluZyJ9XV0sInByZWZpeCI6InN0cmluZyIsInRhZ3MiOlsibWFwIiwic3RyaW5nIl0sInRyYW5zaXRpb24iOlsic2V0IixbIm9iamVjdCIseyJkYXRlIjoic3RyaW5nIiwiZGF5cyI6Im51bWJlciIsInN0b3JhZ2VfY2xhc3MiOiJzdHJpbmcifV1dfV1dLCJsb2dnaW5nIjpbInNldCIsWyJvYmplY3QiLHsidGFyZ2V0X2J1Y2tldCI6InN0cmluZyIsInRhcmdldF9wcmVmaXgiOiJzdHJpbmcifV1dLCJvYmplY3RfbG9ja19jb25maWd1cmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7Im9iamVjdF9sb2NrX2VuYWJsZWQiOiJzdHJpbmciLCJydWxlIjpbImxpc3QiLFsib2JqZWN0Iix7ImRlZmF1bHRfcmV0ZW50aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImRheXMiOiJudW1iZXIiLCJtb2RlIjoic3RyaW5nIiwieWVhcnMiOiJudW1iZXIifV1dfV1dfV1dLCJwb2xpY3kiOiJzdHJpbmciLCJyZWdpb24iOiJzdHJpbmciLCJyZXBsaWNhdGlvbl9jb25maWd1cmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7InJvbGUiOiJzdHJpbmciLCJydWxlcyI6WyJzZXQiLFsib2JqZWN0Iix7ImRlc3RpbmF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7ImFjY2Vzc19jb250cm9sX3RyYW5zbGF0aW9uIjpbImxpc3QiLFsib2JqZWN0Iix7Im93bmVyIjoic3RyaW5nIn1dXSwiYWNjb3VudF9pZCI6InN0cmluZyIsImJ1Y2tldCI6InN0cmluZyIsInJlcGxpY2Ffa21zX2tleV9pZCI6InN0cmluZyIsInN0b3JhZ2VfY2xhc3MiOiJzdHJpbmcifV1dLCJmaWx0ZXIiOlsibGlzdCIsWyJvYmplY3QiLHsicHJlZml4Ijoic3RyaW5nIiwidGFncyI6WyJtYXAiLCJzdHJpbmciXX1dXSwiaWQiOiJzdHJpbmciLCJwcmVmaXgiOiJzdHJpbmciLCJwcmlvcml0eSI6Im51bWJlciIsInNvdXJjZV9zZWxlY3Rpb25fY3JpdGVyaWEiOlsibGlzdCIsWyJvYmplY3QiLHsic3NlX2ttc19lbmNyeXB0ZWRfb2JqZWN0cyI6WyJsaXN0IixbIm9iamVjdCIseyJlbmFibGVkIjoiYm9vbCJ9XV19XV0sInN0YXR1cyI6InN0cmluZyJ9XV19XV0sInJlcXVlc3RfcGF5ZXIiOiJzdHJpbmciLCJzZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2NvbmZpZ3VyYXRpb24iOlsibGlzdCIsWyJvYmplY3QiLHsicnVsZSI6WyJsaXN0IixbIm9iamVjdCIseyJhcHBseV9zZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2J5X2RlZmF1bHQiOlsibGlzdCIsWyJvYmplY3QiLHsia21zX21hc3Rlcl9rZXlfaWQiOiJzdHJpbmciLCJzc2VfYWxnb3JpdGhtIjoic3RyaW5nIn1dXX1dXX1dXSwidGFncyI6WyJtYXAiLCJzdHJpbmciXSwidmVyc2lvbmluZyI6WyJsaXN0IixbIm9iamVjdCIseyJlbmFibGVkIjoiYm9vbCIsIm1mYV9kZWxldGUiOiJib29sIn1dXSwid2Vic2l0ZSI6WyJsaXN0IixbIm9iamVjdCIseyJlcnJvcl9kb2N1bWVudCI6InN0cmluZyIsImluZGV4X2RvY3VtZW50Ijoic3RyaW5nIiwicmVkaXJlY3RfYWxsX3JlcXVlc3RzX3RvIjoic3RyaW5nIiwicm91dGluZ19ydWxlcyI6InN0cmluZyJ9XV0sIndlYnNpdGVfZG9tYWluIjoic3RyaW5nIiwid2Vic2l0ZV9lbmRwb2ludCI6InN0cmluZyJ9XQ==", - "Val": "eyJhY2NlbGVyYXRpb25fc3RhdHVzIjoiIiwiYWNsIjpudWxsLCJhcm4iOiJhcm46YXdzOnMzOjo6YnVja2V0LW1hcnRpbi10ZXN0LWRyaWZ0MyIsImJ1Y2tldCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDMiLCJidWNrZXRfZG9tYWluX25hbWUiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzLnMzLmFtYXpvbmF3cy5jb20iLCJidWNrZXRfcHJlZml4IjpudWxsLCJidWNrZXRfcmVnaW9uYWxfZG9tYWluX25hbWUiOiJidWNrZXQtbWFydGluLXRlc3QtZHJpZnQzLnMzLmFwLW5vcnRoZWFzdC0xLmFtYXpvbmF3cy5jb20iLCJjb3JzX3J1bGUiOltdLCJmb3JjZV9kZXN0cm95IjpudWxsLCJncmFudCI6W10sImhvc3RlZF96b25lX2lkIjoiWjJNNEVIVVIyNlA3WlciLCJpZCI6ImJ1Y2tldC1tYXJ0aW4tdGVzdC1kcmlmdDMiLCJsaWZlY3ljbGVfcnVsZSI6W10sImxvZ2dpbmciOltdLCJvYmplY3RfbG9ja19jb25maWd1cmF0aW9uIjpbXSwicG9saWN5IjpudWxsLCJyZWdpb24iOiJhcC1ub3J0aGVhc3QtMSIsInJlcGxpY2F0aW9uX2NvbmZpZ3VyYXRpb24iOltdLCJyZXF1ZXN0X3BheWVyIjoiQnVja2V0T3duZXIiLCJzZXJ2ZXJfc2lkZV9lbmNyeXB0aW9uX2NvbmZpZ3VyYXRpb24iOltdLCJ0YWdzIjp7fSwidmVyc2lvbmluZyI6W3siZW5hYmxlZCI6ZmFsc2UsIm1mYV9kZWxldGUiOmZhbHNlfV0sIndlYnNpdGUiOltdLCJ3ZWJzaXRlX2RvbWFpbiI6bnVsbCwid2Vic2l0ZV9lbmRwb2ludCI6bnVsbH0=", - "Err": null -} \ No newline at end of file diff --git a/pkg/remote/aws/test/s3_bucket_multiple/results.golden.json b/pkg/remote/aws/test/s3_bucket_multiple/results.golden.json index 13c2d23a..2cf90d40 100755 --- a/pkg/remote/aws/test/s3_bucket_multiple/results.golden.json +++ b/pkg/remote/aws/test/s3_bucket_multiple/results.golden.json @@ -1,98 +1,66 @@ [ - { - "acceleration_status": "", - "acl": null, - "arn": "arn:aws:s3:::bucket-martin-test-drift2", - "bucket": "bucket-martin-test-drift2", - "bucket_domain_name": "bucket-martin-test-drift2.s3.amazonaws.com", - "bucket_prefix": null, - "bucket_regional_domain_name": "bucket-martin-test-drift2.s3.eu-west-3.amazonaws.com", - "cors_rule": [], - "force_destroy": null, - "grant": [], - "hosted_zone_id": "Z3R1K369G5AVDG", - "id": "bucket-martin-test-drift2", - "lifecycle_rule": [], - "logging": [], - "object_lock_configuration": [], - "policy": null, - "region": "eu-west-3", - "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-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 - } + { + "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-drift2", + "bucket": "bucket-martin-test-drift2", + "bucket_domain_name": "bucket-martin-test-drift2.s3.amazonaws.com", + "bucket_prefix": null, + "bucket_regional_domain_name": "bucket-martin-test-drift2.s3.eu-west-3.amazonaws.com", + "cors_rule": [], + "force_destroy": null, + "grant": [], + "hosted_zone_id": "Z3R1K369G5AVDG", + "id": "bucket-martin-test-drift2", + "lifecycle_rule": [], + "logging": [], + "object_lock_configuration": [], + "policy": null, + "region": "eu-west-3", + "replication_configuration": [], + "request_payer": "BucketOwner", + "server_side_encryption_configuration": [], + "tags": {}, + "versioning": [ + { + "enabled": false, + "mfa_delete": false + } + ], + "website": [], + "website_domain": null, + "website_endpoint": null + } ] \ No newline at end of file