ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3863 from hashicorp/b-aws-elb-access-fix 

providers/aws: Fix issue with removing access_logs from ELB
This commit is contained in:
Clint 2015-11-12 14:24:58 -06:00
parent 9d27504133 7f2244183c
commit dcf40661c8
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/providers/aws/structure.go
View File

@ -239,24 +239,21 @@ func expandElastiCacheParameters(configured []interface{}) ([]*elasticache.Param
}
// Flattens an access log into something that flatmap.Flatten() can handle
func flattenAccessLog(log *elb.AccessLog) []map[string]interface{} {
func flattenAccessLog(l *elb.AccessLog) []map[string]interface{} {
result := make([]map[string]interface{}, 0, 1)
if log != nil {
if l != nil && *l.Enabled {
r := make(map[string]interface{})
// enabled is the only value we can rely on to not be nil
r["enabled"] = *log.Enabled
if log.S3BucketName != nil {
r["bucket"] = *log.S3BucketName
if l.S3BucketName != nil {
r["bucket"] = *l.S3BucketName
}
if log.S3BucketPrefix != nil {
r["bucket_prefix"] = *log.S3BucketPrefix
if l.S3BucketPrefix != nil {
r["bucket_prefix"] = *l.S3BucketPrefix
}
if log.EmitInterval != nil {
r["interval"] = *log.EmitInterval
if l.EmitInterval != nil {
r["interval"] = *l.EmitInterval
}
result = append(result, r)