Use require.NoError where applicable (#253)

pkg/cmd/resource/events_resend_test.go

@@ -18,7 +18,7 @@ func TestRunEventsResendCmd(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		body, err := ioutil.ReadAll(r.Body)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		require.Equal(t, http.MethodPost, r.Method)
 		require.Equal(t, "/v1/events/evt_123/retry", r.URL.Path)
@@ -48,7 +48,7 @@ func TestRunEventsResendCmd_WithWebhookEndpoint(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		body, err := ioutil.ReadAll(r.Body)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		require.Equal(t, http.MethodPost, r.Method)
 		require.Equal(t, "/v1/events/evt_123/retry", r.URL.Path)

pkg/cmd/resource/operation_test.go

@@ -34,7 +34,7 @@ func TestRunOperationCmd(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		body, err := ioutil.ReadAll(r.Body)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		require.Equal(t, http.MethodPost, r.Method)
 		require.Equal(t, "/v1/bars/bar_123", r.URL.Path)
@@ -75,7 +75,7 @@ func TestRunOperationCmd_ExtraParams(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		body, err := ioutil.ReadAll(r.Body)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		require.Equal(t, http.MethodPost, r.Method)
 		require.Equal(t, "/v1/bars/bar_123", r.URL.Path)

pkg/cmd/root_test.go

@@ -29,7 +29,7 @@ func TestGetPathNoXDG(t *testing.T) {
 	expected, err := homedir.Dir()
 	expected += "/.config/stripe"
 
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, actual, expected)
 }
 

pkg/login/interactive_login_test.go

@@ -15,7 +15,7 @@ func TestAPIKeyInput(t *testing.T) {
 	actualKey, err := getConfigureAPIKey(keyInput)
 
 	require.Equal(t, expectedKey, actualKey)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestAPIKeyInputEmpty(t *testing.T) {

pkg/login/login_message_test.go

@@ -18,7 +18,7 @@ func TestSuccessMessage(t *testing.T) {
 	account.Settings.Dashboard.DisplayName = testDisplayName
 
 	msg, err := SuccessMessage(account, "", "sk_test_123")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(
 		t,
 		"Done! The Stripe CLI is configured for test_disp_name with account id acct_123\n",
@@ -32,7 +32,7 @@ func TestSuccessMessageNoDisplayName(t *testing.T) {
 	}
 
 	msg, err := SuccessMessage(account, "", "sk_test_123")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(
 		t,
 		"Done! The Stripe CLI is configured for your account with account id acct_123\n",
@@ -43,7 +43,7 @@ func TestSuccessMessageNoDisplayName(t *testing.T) {
 func TestSuccessMessageBasicMessage(t *testing.T) {
 	account := &Account{}
 	msg, err := SuccessMessage(account, "", "sk_test_123")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(
 		t,
 		"Done! The Stripe CLI is configured\n",
@@ -67,7 +67,7 @@ func TestSuccessMessageGetAccount(t *testing.T) {
 	defer ts.Close()
 
 	msg, err := SuccessMessage(nil, ts.URL, "sk_test_123")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(
 		t,
 		"Done! The Stripe CLI is configured for test_disp_name with account id acct_123\n",
@@ -90,7 +90,7 @@ func TestSuccessMessageGetAccountNoDisplayName(t *testing.T) {
 	defer ts.Close()
 
 	msg, err := SuccessMessage(nil, ts.URL, "sk_test_123")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(
 		t,
 		"Done! The Stripe CLI is configured for your account with account id acct_123\n",

pkg/logtailing/tailer_test.go

@@ -20,7 +20,7 @@ func TestJsonifyFiltersAll(t *testing.T) {
 	}
 	expected := fmt.Sprintf(`{"filter_account":["my-account"],"filter_ip_address":["my-ip-address"],"filter_http_method":["my-http-method"],"filter_request_path":["my-request-path"],"filter_request_status":["my-request-status"],"filter_source":["my-source"],"filter_status_code":["my-status-code"],"filter_status_code_type":["my-status-code-type"]}`)
 	filtersStr, err := jsonifyFilters(filters)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, expected, filtersStr)
 }
 
@@ -31,7 +31,7 @@ func TestJsonifyFiltersSome(t *testing.T) {
 	}
 	expected := fmt.Sprintf(`{"filter_http_method":["my-http-method"],"filter_status_code":["my-status-code"]}`)
 	filtersStr, err := jsonifyFilters(filters)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, expected, filtersStr)
 }
 
@@ -47,7 +47,7 @@ func TestJsonifyFiltersEmpty(t *testing.T) {
 		FilterStatusCodeType: []string{},
 	}
 	filtersStr, err := jsonifyFilters(filters)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "{}", filtersStr)
 }
 

pkg/proxy/endpoint_test.go

@@ -19,7 +19,7 @@ func TestClientHandler(t *testing.T) {
 		w.Write([]byte("OK!"))
 
 		reqBody, err := ioutil.ReadAll(r.Body)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		require.Equal(t, http.MethodPost, r.Method)
 		require.Equal(t, "TestAgent/v1", r.UserAgent())
@@ -47,7 +47,7 @@ func TestClientHandler(t *testing.T) {
 		&EndpointConfig{
 			ResponseHandler: EndpointResponseHandlerFunc(func(evtCtx eventContext, forwardURL string, resp *http.Response) {
 				buf, err := ioutil.ReadAll(resp.Body)
-				require.Nil(t, err)
+				require.NoError(t, err)
 
 				rcvCtx = evtCtx
 				rcvBody = string(buf)
@@ -76,7 +76,7 @@ func TestClientHandler(t *testing.T) {
 
 	wg.Wait()
 
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "OK!", rcvBody)
 	require.Equal(t, ts.URL, rcvForwardURL)
 	require.Equal(t, "wh_123", rcvCtx.webhookID)

pkg/requests/base_test.go

@@ -86,7 +86,7 @@ func TestMakeRequest(t *testing.T) {
 		w.Write([]byte("OK!"))
 
 		reqBody, err := ioutil.ReadAll(r.Body)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		require.Equal(t, http.MethodGet, r.Method)
 		require.Equal(t, "/foo/bar", r.URL.Path)
@@ -136,7 +136,7 @@ func TestGetUserConfirmationRequired(t *testing.T) {
 
 	confirmed, err := rb.getUserConfirmation(reader)
 	require.True(t, confirmed)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestGetUserConfirmationNotRequired(t *testing.T) {
@@ -148,7 +148,7 @@ func TestGetUserConfirmationNotRequired(t *testing.T) {
 
 	confirmed, err := rb.getUserConfirmation(reader)
 	require.True(t, confirmed)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestGetUserConfirmationAutoConfirm(t *testing.T) {
@@ -160,7 +160,7 @@ func TestGetUserConfirmationAutoConfirm(t *testing.T) {
 
 	confirmed, err := rb.getUserConfirmation(reader)
 	require.True(t, confirmed)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestGetUserConfirmationNoConfirm(t *testing.T) {
@@ -172,7 +172,7 @@ func TestGetUserConfirmationNoConfirm(t *testing.T) {
 
 	confirmed, err := rb.getUserConfirmation(reader)
 	require.False(t, confirmed)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestNormalizePath(t *testing.T) {