diff options
Diffstat (limited to 'api.go')
| -rw-r--r-- | api.go | 46 |
1 files changed, 31 insertions, 15 deletions
@@ -99,37 +99,46 @@ func SetRow(dnsRow *RRT) { } func GetZonefile(c *ConfigT) *DNSRecords { - var url = cloudflareURL + c.ZoneID + "/dns_records/?per_page=100" + var url = cloudflareURL + c.ZoneID + "/dns_records/?per_page=10" log.Println("getZonefile()", c.Domain, url) req, err := http.NewRequest("GET", url, nil) if err != nil { - log.Println("http.NewRequest error:", err) + log.Error(err, "http.NewRequest error") return nil } // Set headers - req.Header.Set("X-Auth-Key", c.Auth) - req.Header.Set("X-Auth-Email", c.Email) + req.Header.Set("Authorization", "Bearer " + c.Auth) + // req.Header.Set("X-Auth-Key", c.Auth) + // req.Header.Set("X-Auth-Email", c.Email) log.Println("getZonefile() auth, email", c.Auth, c.Email) client := &http.Client{} resp, err := client.Do(req) + // log.Spew("SPEWING", resp) if err != nil { - log.Println("http.Client error:", err) + log.Error(err, "http.Client error") return nil } defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) if err != nil { - log.Println("ioutil.ReadAll() error", err) + log.Error(err, "ioutil.ReadAll() error") return nil } + log.Spew("SPEWING", body) + pretty, err := FormatJSON(string(body)) + if err != nil { + log.Error(err, "FormatJSON error") + } else { + log.Warn(pretty) + } var records DNSRecords if err := json.Unmarshal(body, &records); err != nil { - log.Println("json.Unmarshal() error", err) + log.Error(err, "json.Unmarshal() error") return nil } @@ -166,35 +175,42 @@ func GetZones(auth, email string) *DNSRecords { log.Println("getZones()", url) req, err := http.NewRequest("GET", url, nil) if err != nil { - log.Println("http.NewRequest error:", err) + log.Error(err, "http.NewRequest error") return nil } // Set headers - req.Header.Set("X-Auth-Key", auth) - req.Header.Set("X-Auth-Email", email) + req.Header.Set("Authorization", "Bearer " + auth) + // req.Header.Set("X-Auth-Key", auth) + // req.Header.Set("X-Auth-Email", email) log.Println("getZones() auth, email", auth, email) client := &http.Client{} resp, err := client.Do(req) if err != nil { - log.Println("getZones() http.Client error:", err) + log.Error(err, "getZones() http.Client error") return nil } defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) if err != nil { - log.Println("getZones() ioutil.ReadAll() error", err) + log.Error(err, "getZones() ioutil.ReadAll() error") return nil } var records DNSRecords if err := json.Unmarshal(body, &records); err != nil { - log.Println("getZones() json.Unmarshal() error", err) + log.Error(err, "getZones() json.Unmarshal() error") return nil } + pretty, err := FormatJSON(string(body)) + if err != nil { + log.Error(err, "FormatJSON error") + } else { + log.Warn(pretty) + } /* Cloudflare API returns struct[] of: struct { ID string "json:\"id\""; Type string "json:\"type\""; Name string "json:\"name\""; @@ -206,8 +222,8 @@ func GetZones(auth, email string) *DNSRecords { // log.Println("spew dump:") // spew.Dump(records) for _, record := range records.Result { - log.Println("spew record:", record) - log.Println("record:", record.Name, record.ID) + log.Spew("spew record:", record) + log.Info("record:", record.Name, record.ID) var newc *ConfigT newc = new(ConfigT) |