Add error return value to NewApi()

leanovate · Apr 10, 2019 · fd3939f · fd3939f
1 parent 519c8f6
commit fd3939f
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 18 deletions.
diff --git a/app/app.go b/app/app.go
@@ -37,7 +37,10 @@ func NewApplication(fullConfigPath string) (*Application, error) {
 	}
 
 	c := config.NewConfig(fullConfigPath)
-	api := mite.NewApi(c.GetApiUrl(), c.GetApiKey(), version)
+	api, err := mite.NewApi(c.GetApiUrl(), c.GetApiKey(), version)
+	if err != nil {
+		return nil, err
+	}
 
 	if c.GetApiUrl() == "" {
 		_, _ = fmt.Fprintln(os.Stderr, "please configure your API url by executing: 'mite config api.url=<your mite api url>'")

diff --git a/mite/api.go b/mite/api.go
@@ -29,9 +29,9 @@ type api struct {
 	client    *http.Client
 }
 
-func NewApi(base string, key string, version string) Api {
+func NewApi(base string, key string, version string) (Api, error) {
 	ua := fmt.Sprintf(userAgentTemplate, version)
-	return &api{base: base, key: key, userAgent: ua, client: &http.Client{}}
+	return &api{base: base, key: key, userAgent: ua, client: &http.Client{}}, nil
 }
 
 func (a *api) get(resource string, result interface{}) error {

diff --git a/mite/project_test.go b/mite/project_test.go
@@ -59,7 +59,8 @@ func TestApi_Projects(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	projects, err := api.Projects()

diff --git a/mite/service_test.go b/mite/service_test.go
@@ -45,7 +45,8 @@ func TestApi_Services(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	services, err := api.Services()

diff --git a/mite/time_entry_test.go b/mite/time_entry_test.go
@@ -82,7 +82,8 @@ func TestApi_TimeEntries(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	timeEntries, err := api.TimeEntries(nil)
@@ -113,7 +114,8 @@ func TestApi_TimeEntries_WithQuery(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	today := domain.Today()
@@ -150,7 +152,8 @@ func TestApi_TimeEntry(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	timeEntry, err := api.TimeEntry(timeEntryObject.Id)
@@ -186,7 +189,8 @@ func TestApi_CreateTimeEntry(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	command := &domain.TimeEntryCommand{
@@ -229,7 +233,8 @@ func TestApi_EditTimeEntry(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	command := &domain.TimeEntryCommand{
@@ -239,7 +244,7 @@ func TestApi_EditTimeEntry(t *testing.T) {
 		ProjectId: timeEntryObject.ProjectId,
 		ServiceId: timeEntryObject.ServiceId,
 	}
-	err := api.EditTimeEntry(timeEntryObject.Id, command)
+	err = api.EditTimeEntry(timeEntryObject.Id, command)
 
 	// then
 	assert.Nil(t, err)
@@ -265,10 +270,11 @@ func TestApi_DeleteTimeEntry(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
-	err := api.DeleteTimeEntry(timeEntryObject.Id)
+	err = api.DeleteTimeEntry(timeEntryObject.Id)
 
 	// then
 	assert.Nil(t, err)

diff --git a/mite/tracker_test.go b/mite/tracker_test.go
@@ -73,7 +73,8 @@ func TestApi_Tracker(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	tracking, err := api.Tracker()
@@ -104,7 +105,8 @@ func TestApi_Tracker_Empty(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	tracking, err := api.Tracker()
@@ -135,7 +137,8 @@ func TestApi_StartTracker(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	tracking, stopped, err := api.StartTracker(trackingTimeEntryObject.Id)
@@ -167,7 +170,8 @@ func TestApi_StartTracker_Running(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	tracking, stopped, err := api.StartTracker(trackingTimeEntryObject.Id)
@@ -199,7 +203,8 @@ func TestApi_StopTracker(t *testing.T) {
 
 	defer srv.Close()
 
-	api := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	api, err := mite.NewApi(srv.URL, testApiKey, testClientVersion)
+	assert.Nil(t, err)
 
 	// when
 	stopped, err := api.StopTracker(stoppedTimeEntryObject.Id)