-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
PLAT-1245 - Delete command for Data Studio #480
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
60 changes: 60 additions & 0 deletions
60
src/main/java/io/seqera/tower/cli/commands/datastudios/DeleteCmd.java
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 |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright 2021-2023, Seqera. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package io.seqera.tower.cli.commands.datastudios; | ||
|
|
||
| import io.seqera.tower.ApiException; | ||
| import io.seqera.tower.cli.commands.global.WorkspaceOptionalOptions; | ||
| import io.seqera.tower.cli.exceptions.DataStudioNotFoundException; | ||
| import io.seqera.tower.cli.exceptions.TowerException; | ||
| import io.seqera.tower.cli.responses.Response; | ||
| import io.seqera.tower.cli.responses.datastudios.DataStudioDeleted; | ||
| import picocli.CommandLine; | ||
|
|
||
| @CommandLine.Command( | ||
| name = "delete", | ||
| description = "Delete a data studio." | ||
| ) | ||
| public class DeleteCmd extends AbstractStudiosCmd { | ||
|
|
||
| @CommandLine.Mixin | ||
| public WorkspaceOptionalOptions workspace; | ||
|
|
||
| @CommandLine.Mixin | ||
| public DataStudioRefOptions dataStudioRefOptions; | ||
|
|
||
| @Override | ||
| protected Response exec() throws ApiException { | ||
| Long wspId = workspaceId(workspace.workspace); | ||
|
|
||
| try { | ||
| String sessionId = getSessionId(dataStudioRefOptions, wspId); | ||
|
|
||
| api().deleteDataStudio(sessionId, wspId); | ||
|
|
||
| return new DataStudioDeleted(dataStudioRefOptions.getDataStudioIdentifier(), workspaceRef(wspId)); | ||
| } catch (ApiException e) { | ||
| if (e.getCode() == 404) { | ||
| throw new DataStudioNotFoundException(dataStudioRefOptions.getDataStudioIdentifier(), workspace.workspace); | ||
| } | ||
| if (e.getCode() == 403) { | ||
| throw new TowerException(String.format("User not entitled to view studio '%s' at %s workspace", dataStudioRefOptions.getDataStudioIdentifier(), workspace.workspace)); | ||
| } | ||
| throw e; | ||
| } | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
src/main/java/io/seqera/tower/cli/responses/datastudios/DataStudioDeleted.java
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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2021-2023, Seqera. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package io.seqera.tower.cli.responses.datastudios; | ||
|
|
||
| import io.seqera.tower.cli.responses.Response; | ||
|
|
||
| public class DataStudioDeleted extends Response { | ||
|
|
||
| public final String userSuppliedStudioIdentifier; | ||
|
|
||
| public final String workspaceRef; | ||
|
|
||
| public DataStudioDeleted(String userSuppliedStudioIdentifier, String workspaceRef) { | ||
| this.userSuppliedStudioIdentifier = userSuppliedStudioIdentifier; | ||
| this.workspaceRef = workspaceRef; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return ansi(String.format("%n @|yellow Data Studio %s deleted at %s workspace.|@%n", userSuppliedStudioIdentifier, workspaceRef)); | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.
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.
PR is implementing delete, are you adding those tests just because you forgot with other PR or It's a mistake?
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.
Yeaah, in the previous PR I had to resolve a some merge conflicts after rebasing and somehow these couple of tests got dropped accidentally after so I am re-adding them in this PR.