Skip to content

Commit

Permalink
hashicorp#2217: get default encryption configuration for s3 bucket da…
Browse files Browse the repository at this point in the history
…ta source
  • Loading branch information
trung committed Nov 15, 2017
1 parent ddb02a8 commit 6824b73
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions aws/data_source_aws_s3_bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,29 @@ func dataSourceAwsS3Bucket() *schema.Resource {
Required: true,
},
"server_side_encryption_configuration": {
Type: schema.TypeSet,
Type: schema.TypeSet,
MaxItems: 1,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema {
"rule" : {
Type: schema.TypeSet,
Schema: map[string]*schema.Schema{
"rule": {
Type: schema.TypeSet,
MaxItems: 1,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema {
Schema: map[string]*schema.Schema{
"apply_server_side_encryption_by_default": {
Type: schema.TypeSet,
Type: schema.TypeSet,
MaxItems: 1,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"kms_master_key_id": {
Type: schema.TypeString,
Type: schema.TypeString,
Computed: true,
},
"sse_algorithm": {
Type: schema.TypeString,
Type: schema.TypeString,
Computed: true,
},
},
Expand Down Expand Up @@ -119,7 +119,7 @@ func bucketEncryption(data *schema.ResourceData, bucket string, conn *s3.S3) err
output, err := conn.GetBucketEncryption(input)
if err != nil {
if isAWSErr(err, "ServerSideEncryptionConfigurationNotFoundError", "encryption configuration was not found") {

} else {
return err
}
Expand Down

0 comments on commit 6824b73

Please sign in to comment.