Fix nilaway for TDR

tdr/client.go

@@ -83,10 +83,12 @@ func (c *Client) SetBaseTDRURL(urlStr string) error {
 	if !strings.HasSuffix(urlStr, "/") {
 		urlStr += "/"
 	}
-
-	var err error
-	c.baseTDRURL, err = url.Parse(urlStr)
-	return err
+	tdrURL, err := url.Parse(urlStr)
+	if err != nil {
+		return err
+	}
+	c.baseTDRURL = tdrURL
+	return nil
 }
 
 // newTDRRequest creates an new TDR API request. A relative URL path can be provided in
@@ -159,7 +161,7 @@ type Response struct {
 }
 
 func (r *Response) StatusCode() int {
-	if r.Response != nil {
+	if r != nil && r.Response != nil {
 		return r.Response.StatusCode
 	}
 	return 0
@@ -179,6 +181,9 @@ func (c *Client) Do(req *http.Request, v interface{}) (*Response, error) {
 	if err != nil {
 		return nil, err
 	}
+	if resp == nil {
+		return nil, fmt.Errorf("response is nil")
+	}
 	defer func() {
 		_ = resp.Body.Close()
 	}()
@@ -192,7 +197,7 @@ func (c *Client) Do(req *http.Request, v interface{}) (*Response, error) {
 		return response, err
 	}
 
-	if v != nil {
+	if v != nil && resp.Body != nil {
 		if w, ok := v.(io.Writer); ok {
 			_, err = io.Copy(w, resp.Body)
 		} else {

tdr/client_test.go

@@ -103,6 +103,9 @@ func TestDebug(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error: %v", err)
 	}
+	if serverTDR == nil {
+		t.Fatal("No serverTDR")
+	}
 
 	tdrClient, err = NewClient(iamClient, &Config{
 		TDRURL:   serverTDR.URL,

tdr/contracts_service_test.go

@@ -13,6 +13,10 @@ func TestGetContract(t *testing.T) {
 	teardown := setup(t)
 	defer teardown()
 
+	if tdrClient == nil {
+		t.Fatal("Expected tdrClient to be set")
+	}
+
 	muxTDR.HandleFunc("/store/tdr/Contract", func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Query().Get("dataType") == "" {
 			w.WriteHeader(http.StatusBadRequest)
@@ -126,6 +130,10 @@ func TestCreateContract(t *testing.T) {
 	teardown := setup(t)
 	defer teardown()
 
+	if tdrClient == nil {
+		t.Fatal("Expected tdrClient to be set")
+	}
+
 	muxTDR.HandleFunc("/store/tdr/Contract", func(w http.ResponseWriter, r *http.Request) {
 		body, err := io.ReadAll(r.Body)
 		if err != nil {

tdr/data_items_service_test.go

@@ -12,6 +12,10 @@ func TestGetDataItem(t *testing.T) {
 	teardown := setup(t)
 	defer teardown()
 
+	if tdrClient == nil {
+		t.Fatal("Expected tdrClient to be set")
+	}
+
 	muxTDR.HandleFunc("/store/tdr/DataItem", func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Query().Get("organization") == "" {
 			w.WriteHeader(http.StatusBadRequest)