fix: project delete function uses correct string representation of id #1733
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,7 +42,7 @@ var ( | |
| projectStateNameDiff = project.TfProjectRSModel{ | ||
| Name: diffName, | ||
| } | ||
| dummyProjectID = "6575af27f93c7a6a4b50b239" | ||
| ) | ||
|
|
||
| func TestGetProjectPropsFromAPI(t *testing.T) { | ||
|
|
@@ -418,6 +418,59 @@ func TestUpdateProjectTeams(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| func TestResourceProjectDependentsDeletingRefreshFunc(t *testing.T) { | ||
| testCases := []struct { | ||
| name string | ||
| mockResponses ProjectResponse | ||
| expectedError bool | ||
| }{ | ||
| { | ||
| name: "Error not from the API", | ||
| mockResponses: ProjectResponse{ | ||
| clusterReponse: &admin.PaginatedAdvancedClusterDescription{}, | ||
| Err: errors.New("Non-API error"), | ||
| }, | ||
| expectedError: false, | ||
| }, | ||
| { | ||
| name: "Error from the API", | ||
| mockResponses: ProjectResponse{ | ||
| clusterReponse: &admin.PaginatedAdvancedClusterDescription{}, | ||
| Err: &admin.GenericOpenAPIError{}, | ||
| }, | ||
| expectedError: true, | ||
| }, | ||
| { | ||
| name: "Successful API call", | ||
| mockResponses: ProjectResponse{ | ||
| clusterReponse: &admin.PaginatedAdvancedClusterDescription{ | ||
| TotalCount: conversion.IntPtr(2), | ||
| Results: []admin.AdvancedClusterDescription{ | ||
| {StateName: conversion.StringPtr("IDLE")}, | ||
| {StateName: conversion.StringPtr("DELETING")}, | ||
| }, | ||
| }, | ||
| Err: nil, | ||
| }, | ||
| expectedError: false, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| testObject := new(MockProjectService) | ||
|
|
||
| testObject.On("ListClusters", mock.Anything, dummyProjectID).Return(tc.mockResponses) | ||
|
|
||
| _, _, err := project.ResourceProjectDependentsDeletingRefreshFunc(context.Background(), dummyProjectID, testObject)() | ||
|
|
||
| if (err != nil) != tc.expectedError { | ||
| t.Errorf("Case %s: Received unexpected error: %v", tc.name, err) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestAccProjectRSProject_basic(t *testing.T) { | ||
| var ( | ||
| group admin.Group | ||
|
|
@@ -901,10 +954,17 @@ func (a *MockProjectService) AddAllTeamsToProject(ctx context.Context, groupID s | |
| return response.ProjectTeamResp, response.HTTPResponse, response.Err | ||
| } | ||
|
|
||
| func (a *MockProjectService) ListClusters(ctx context.Context, groupID string) (*admin.PaginatedAdvancedClusterDescription, *http.Response, error) { | ||
| args := a.Called(ctx, groupID) | ||
| var response = args.Get(0).(ProjectResponse) | ||
| return response.clusterReponse, response.HTTPResponse, response.Err | ||
| } | ||
|
|
||
| type ProjectResponse struct { | ||
| ProjectResp *admin.Group | ||
| ProjectTeamResp *admin.PaginatedTeamRole | ||
| GroupSettingsResponse *admin.GroupSettings | ||
| clusterReponse *admin.PaginatedAdvancedClusterDescription | ||
| HTTPResponse *http.Response | ||
| Err error | ||
| LimitResponse admin.DataFederationLimit | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ type GroupProjectService interface { | |
| RemoveProjectTeam(ctx context.Context, groupID, teamID string) (*http.Response, error) | ||
| UpdateTeamRoles(ctx context.Context, groupID, teamID string, teamRole *admin.TeamRole) (*admin.PaginatedTeamRole, *http.Response, error) | ||
| AddAllTeamsToProject(ctx context.Context, groupID string, teamRole *[]admin.TeamRole) (*admin.PaginatedTeamRole, *http.Response, error) | ||
| ListClusters(ctx context.Context, groupID string) (*admin.PaginatedAdvancedClusterDescription, *http.Response, error) | ||
| } | ||
|
|
||
| type GroupProjectServiceFromClient struct { | ||
|
|
@@ -60,6 +61,10 @@ func (a *GroupProjectServiceFromClient) AddAllTeamsToProject(ctx context.Context | |
| return a.client.TeamsApi.AddAllTeamsToProject(ctx, groupID, teamRole).Execute() | ||
| } | ||
|
|
||
| func (a *GroupProjectServiceFromClient) ListClusters(ctx context.Context, groupID string) (*admin.PaginatedAdvancedClusterDescription, *http.Response, error) { | ||
| return a.client.ClustersApi.ListClusters(ctx, groupID).Execute() | ||
| } | ||
|
|
||
| func ServiceFromClient(client *admin.APIClient) GroupProjectService { | ||
| return &GroupProjectServiceFromClient{ | ||
| client: client, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we have a test that fails before this change and passes after?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we now have. The call we mock in the test is only mocked with correct projectId, so in case the string has extra quotes, tests fail. See image
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
great, thx!