Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use gofastly library in ip ranges data source #201

Merged
merged 1 commit into from
Dec 13, 2019
Merged

Use gofastly library in ip ranges data source #201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions fastly/data_source_ip_ranges.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package fastly

import (
"encoding/json"
"fmt"
"io/ioutil"
"log"
"sort"
"strconv"

"github.com/hashicorp/go-cleanhttp"
"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)
Expand All @@ -33,35 +29,21 @@ func dataSourceFastlyIPRanges() *schema.Resource {

func dataSourceFastlyIPRangesRead(d *schema.ResourceData, meta interface{}) error {

conn := cleanhttp.DefaultClient()
conn := meta.(*FastlyClient).conn

log.Printf("[DEBUG] Reading IP ranges")

res, err := conn.Get("https://api.fastly.com/public-ip-list")
addresses, err := conn.IPs()

if err != nil {
return fmt.Errorf("Error listing IP ranges: %s", err)
}

defer res.Body.Close()
d.SetId(hashcode.Strings(addresses))

data, err := ioutil.ReadAll(res.Body)
sort.Strings(addresses)

if err != nil {
return fmt.Errorf("Error reading response body: %s", err)
}

d.SetId(strconv.Itoa(hashcode.String(string(data))))

result := new(dataSourceFastlyIPRangesResult)

if err := json.Unmarshal(data, result); err != nil {
return fmt.Errorf("Error parsing result: %s", err)
}

sort.Strings(result.Addresses)

if err := d.Set("cidr_blocks", result.Addresses); err != nil {
if err := d.Set("cidr_blocks", addresses); err != nil {
return fmt.Errorf("Error setting ip ranges: %s", err)
}

Expand Down