Fixed issues from vet and formatting

sky-uk · Jul 7, 2017 · f9cb0ad · f9cb0ad
2 parents 47c0591 + 304e43f
commit f9cb0ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/infoblox/resource_a_record_test.go b/infoblox/resource_a_record_test.go
@@ -56,7 +56,7 @@ func testAccResourceARecordDestroy(state *terraform.State) error {
 		}
 
 		if api.GetResponse().Name == "arecordcreated.test-ovp.bskyb.com" {
-			return fmt.Errorf("A record still exists", api.GetResponse())
+			return fmt.Errorf("A record still exists: %+v", api.GetResponse())
 		}
 
 	}
@@ -67,7 +67,7 @@ func testAccResourceARecordExists(recordName, resourceName string) resource.Test
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[resourceName]
 		if !ok {
-			return fmt.Errorf("\nInfoblox A record resource %s not found in resources", resourceName)
+			return fmt.Errorf("\nInfoblox A record resource %s not found in resources: ", resourceName)
 		}
 		if rs.Primary.ID == "" {
 			return fmt.Errorf("\nInfoblox A record resource %s ID not set", resourceName)
@@ -77,7 +77,7 @@ func testAccResourceARecordExists(recordName, resourceName string) resource.Test
 		getAllARec := records.NewGetAllARecords(fields)
 		err := infobloxClient.Do(getAllARec)
 		if err != nil {
-			return fmt.Errorf("Error getting the A record", err)
+			return fmt.Errorf("Error getting the A record: %+v", err)
 		}
 		for _, x := range getAllARec.GetResponse() {
 			if x.Name == recordName {

diff --git a/infoblox/resource_network_test.go b/infoblox/resource_network_test.go
@@ -56,7 +56,7 @@ func testAccResourceNetworkDestroy(state *terraform.State) error {
 		}
 
 		if api.GetResponse().Network == "arecordcreated.test-ovp.bskyb.com" {
-			return fmt.Errorf("Network still exists", api.GetResponse())
+			return fmt.Errorf("Network still exists: %+v", api.GetResponse())
 		}
 
 	}
@@ -65,6 +65,9 @@ func testAccResourceNetworkDestroy(state *terraform.State) error {
 
 func testAccResourceNetworkExists(networkAddr, resourceName string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
+
+		var fields []string
+
 		rs, ok := state.RootModule().Resources[resourceName]
 		if !ok {
 			return fmt.Errorf("\nInfoblox Network resource %s not found in resources", resourceName)
@@ -73,10 +76,10 @@ func testAccResourceNetworkExists(networkAddr, resourceName string) resource.Tes
 			return fmt.Errorf("\nInfoblox Network resource %s ID not set", resourceName)
 		}
 		infobloxClient := testAccProvider.Meta().(*skyinfoblox.InfobloxClient)
-		getAllARec := network.NewGetAllNetworks()
+		getAllARec := network.NewGetAllNetworks(fields)
 		err := infobloxClient.Do(getAllARec)
 		if err != nil {
-			return fmt.Errorf("Error getting the A record", err)
+			return fmt.Errorf("Error getting the A record: %q", err.Error())
 		}
 		for _, x := range getAllARec.GetResponse() {
 			if x.Network == networkAddr {

diff --git a/infoblox/resource_srv_record_test.go b/infoblox/resource_srv_record_test.go
@@ -66,7 +66,7 @@ func testAccResourceSRVRecordExists(recordName, resourceName string) resource.Te
 		err := infobloxClient.Do(getAllSRVRecords)
 
 		if err != nil {
-			return fmt.Errorf("Error getting the SRV record", err)
+			return fmt.Errorf("Error getting the SRV record: %q", err.Error())
 		}
 		for _, x := range getAllSRVRecords.GetResponse() {
 			if x.Name == recordName {
@@ -96,7 +96,7 @@ func testAccResourceSRVRecordDestroy(state *terraform.State) error {
 		}
 
 		if api.GetResponse().Name == "srv-recordcreated.test-ovp.bskyb.com" {
-			return fmt.Errorf("A record still exists", api.GetResponse())
+			return fmt.Errorf("A record still exists: %+v", api.GetResponse())
 		}
 
 	}

diff --git a/infoblox/resource_txt_record.go b/infoblox/resource_txt_record.go
@@ -246,7 +246,7 @@ func resourceTXTRecordRead(d *schema.ResourceData, m interface{}) error {
 	}
 
 	d.SetId("")
-	errStr := fmt.Sprintf("[resourceTXTRecordRead]:Return code: ", recordAPI.StatusCode())
+	errStr := fmt.Sprintf("[resourceTXTRecordRead]:Return code: %d", recordAPI.StatusCode())
 	return errors.New(errStr)
 }
 

diff --git a/infoblox/resource_txt_record_test.go b/infoblox/resource_txt_record_test.go
@@ -46,7 +46,7 @@ func testAccResourceTXTRecordExists(recordName, resourceName string) resource.Te
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[resourceName]
 		if !ok {
-			return fmt.Errorf("\nResource not found: ", resourceName)
+			return fmt.Errorf("\nResource not found: %s", resourceName)
 		}
 		if rs.Primary.ID == "" {
 			return fmt.Errorf("\nInfoblox TXT record resource %s ID not set", resourceName)
@@ -57,7 +57,7 @@ func testAccResourceTXTRecordExists(recordName, resourceName string) resource.Te
 		recAPI := records.NewGetTXTRecord(ref, fields)
 		err := infobloxClient.Do(recAPI)
 		if err != nil {
-			return fmt.Errorf("Error getting the TXT record", err)
+			return fmt.Errorf("Error getting the TXT record: %q", err.Error())
 		}
 		if recAPI.StatusCode() == http.StatusOK {
 			return nil
@@ -80,7 +80,7 @@ func testAccResourceTXTRecordDestroy(state *terraform.State) error {
 		}
 
 		if api.StatusCode() == http.StatusOK {
-			return fmt.Errorf("TXT record still exists, ref: ", ref)
+			return fmt.Errorf("TXT record still exists, ref: %v", ref)
 		}
 		return nil
 	}