Skip to content

fix: incorrect error handling in org id default function #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: incorrect error handling in org id default function #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func defaultFuncOrganization(engine workflow.Engine, config configuration.Config
logger.Print("Failed to determine default value for \"ORGANIZATION\":", err)
}

return orgId, nil
return orgId, err
}
return callback
}
Expand Down
25 changes: 25 additions & 0 deletions pkg/app/app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,31 @@ func Test_initConfiguration_useDefaultOrg(t *testing.T) {
assert.Equal(t, defaultOrgSlug, actualOrgSlug)
}

func Test_initConfiguration_failDefaultOrgLookup(t *testing.T) {
// setup mock
ctrl := gomock.NewController(t)
mockApiClient := mocks.NewMockApiClient(ctrl)

// mock assertion
mockApiClient.EXPECT().Init(gomock.Any(), gomock.Any()).AnyTimes()
mockApiClient.EXPECT().GetDefaultOrgId().Return("", errors.New("error")).AnyTimes()

config := configuration.NewInMemory()
engine := workflow.NewWorkFlowEngine(config)
apiClientFactory := func(url string, client *http.Client) api.ApiClient {
return mockApiClient
}
initConfiguration(engine, config, &zlog.Logger, apiClientFactory)

actualOrgId, orgIdError := config.GetStringWithError(configuration.ORGANIZATION)
assert.Error(t, orgIdError)
assert.Empty(t, actualOrgId)

actualOrgSlug, slugError := config.GetStringWithError(configuration.ORGANIZATION_SLUG)
assert.Error(t, slugError)
assert.Empty(t, actualOrgSlug)
}

func Test_initConfiguration_useDefaultOrgAsFallback(t *testing.T) {
orgName := "someOrgName"
defaultOrgId := "someDefaultOrgId"
Expand Down