Skip to content

Commit d0278ec

Browse files
committed
Normalize sets, don’t check for missing services.
1 parent 67bf13f commit d0278ec

1 file changed

Lines changed: 22 additions & 6 deletions

File tree

builtin/providers/aws/data_source_aws_ip_ranges.go

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,35 @@ func dataSourceAwsIPRangesRead(d *schema.ResourceData, meta interface{}) error {
9999
return fmt.Errorf("Error setting sync token: %s", err)
100100
}
101101

102+
get := func(key string) *schema.Set {
103+
104+
set := d.Get(key).(*schema.Set)
105+
106+
for _, e := range set.List() {
107+
108+
s := e.(string)
109+
110+
set.Remove(s)
111+
set.Add(strings.ToLower(s))
112+
113+
}
114+
115+
return set
116+
117+
}
118+
102119
var (
103-
regions = d.Get("regions").(*schema.Set)
104-
services = d.Get("services").(*schema.Set)
105-
noRegionFilter = regions.Len() == 0
106-
noServiceFilter = services.Len() == 0
107-
prefixes []string
120+
regions = get("regions")
121+
services = get("services")
122+
noRegionFilter = regions.Len() == 0
123+
prefixes []string
108124
)
109125

110126
for _, e := range result.Prefixes {
111127

112128
var (
113129
matchRegion = noRegionFilter || regions.Contains(strings.ToLower(e.Region))
114-
matchService = noServiceFilter || services.Contains(strings.ToLower(e.Service))
130+
matchService = services.Contains(strings.ToLower(e.Service))
115131
)
116132

117133
if matchRegion && matchService {

0 commit comments

Comments
 (0)