Misc fixes - tests, metadata region sort, logging (#244)

Author: eravin-ns1

ns1/config.go

@@ -12,13 +12,14 @@ import (
 	"net/http/httputil"
 	"os"
 	"strings"
+	"time"
 
 	ns1 "gopkg.in/ns1/ns1-go.v2/rest"
 )
 
 var (
 	clientVersion     = "1.13.1-pre1"
-	providerUserAgent = "terraform-ns1" + "/" + clientVersion
+	providerUserAgent = "tf-ns1" + "/" + clientVersion
 )
 
 // Config for NS1 API
@@ -100,12 +101,14 @@ func Logging() ns1.Decorator {
 				}
 				msgs = append(msgs, bodymsg)
 			}
+			requestTime := time.Now()
 			response, rerr := d.Do(r)
+			responseTime := time.Now()
 			dump, _ := httputil.DumpResponse(response, true)
 			for _, m := range msgs {
 				log.Printf(m)
 			}
-			log.Printf("[DEBUG] HTTP Response: %s", dump)
+			log.Printf("[DEBUG] HTTP Response (requested at %s, received at %s): %s", requestTime.Format(time.StampMilli), responseTime.Format(time.StampMilli), dump)
 			return response, rerr
 		})
 	}

ns1/resource_record.go

@@ -316,7 +316,7 @@ func answerToMap(a dns.Answer) map[string]interface{} {
 	if a.Meta != nil {
 		log.Println("got meta: ", a.Meta)
 		m["meta"] = metaToMapString(a.Meta)
-		log.Println(m["meta"])
+		log.Println("converted meta to resource string: ", m["meta"])
 	}
 	return m
 }
@@ -603,8 +603,16 @@ func metaToMapString(m *data.Meta) map[string]interface{} {
 	if stringMap != nil {
 		subdivisions := stringMap["subdivisions"]
 		if subdivisions != nil {
+			subd := m.Subdivisions.(map[string]interface{})
+			keys := make([]string, 0, len(subd))
 			var array []string
-			for subRegion, subArray := range m.Subdivisions.(map[string]interface{}) {
+			var subArray interface{}
+			for k := range subd {
+				keys = append(keys, k)
+			}
+			sort.Strings(keys)
+			for _, subRegion := range keys {
+				subArray = subd[subRegion]
 				for _, sub := range subArray.([]interface{}) {
 					array = append(array, subRegion+"-"+sub.(string))
 				}

ns1/resource_record_test.go

@@ -1236,6 +1236,12 @@ resource "ns1_monitoringjob" "test" {
   config = {
     method = "GET"
     url = "https://www.example.com"
+    connect_timeout = "2000"
+    idle_timeout = "3"
+    ipv6 = false
+    follow_redirect = false
+    tls_add_verify = false
+    user_agent = "just testing"
   }
   rules {
     value = "200"

ns1/resource_team_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"reflect"
+	"regexp"
 	"sort"
 	"testing"
 
@@ -102,6 +103,7 @@ func TestAccTeam_ManualDelete(t *testing.T) {
 				Config:             testAccTeamBasic,
 				PlanOnly:           true,
 				ExpectNonEmptyPlan: true,
+				ExpectError:        regexp.MustCompile("GET .*/account/teams/.* not found"),
 			},
 			// Then re-create and make sure it is there again.
 			{