fix: project delete function uses correct string representation of id #1733
Conversation
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
lantoli
reviewed
Dec 11, 2023
| @@ -269,7 +269,7 @@ func (r *projectRS) Create(ctx context.Context, req resource.CreateRequest, resp | |||
|
|
|||
| _, _, err := connV2.TeamsApi.AddAllTeamsToProject(ctx, project.GetId(), NewTeamRoleList(ctx, teams)).Execute() | |||
| if err != nil { | |||
| errd := deleteProject(ctx, r.Client.AtlasV2, project.Id) | |||
| errd := deleteProject(ctx, r.Client.AtlasV2, project.GetId()) | |||
There was a problem hiding this comment.
can we have a test that fails before this change and passes after?
There was a problem hiding this comment.
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
lantoli
approved these changes
Dec 11, 2023
AgustinBettati
approved these changes
Dec 11, 2023
| dependents := AtlasProjectDependants{AdvancedClusters: clusters} | ||
|
|
||
| if _, ok := admin.AsError(err); ok { | ||
| return nil, "", err | ||
| if _, ok := admin.AsError(listClustersErr); ok { |
There was a problem hiding this comment.
(this would imply removing redudant if statement below)
Suggested change
| if _, ok := admin.AsError(listClustersErr); ok { | |
| if listClustersErr != nil { |
curious if we want to unify both error checks, don't see a reason why for ApiError we would return error, while for others SDK error types keep on retrying. Would simply return error for an encountered error.
There was a problem hiding this comment.
I didn't want to change this to avoid changing behaviour, but I think it makes sense to unify it.
|
lantoli
added a commit
that referenced
this pull request
Dec 12, 2023
* master: fix: project delete function uses correct string representation of id (#1733)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Project delete was using wrong string representation of Id, with quotes (
"projectId") instead of plain string (projectId).Within our project delete function we have a logic that waits for all "dependants" to be deleted.
During the SDK migration there was a change with how to obtain the project id that is used to list the cluster of a project, which is now passing an incorrect value. This API call uses nonNullProjectID of type types.String, so nonNullProjectID.String() was responding with "6575af27f93c7a6a4b50b239" resulting in an error by the SDK: "groupId must have less than 24 elements”. Due to whats seems like incorrect logic, this error simply lead to retrying constantly until eventually the timeout is reached.
Type of change:
Required Checklist:
Further comments