Skip to content

refactor(ec2): swap order of icons. #6224

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

Merged
justinmk3 merged 18 commits into from
Dec 12, 2024
Merged

refactor(ec2): swap order of icons. #6224

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
018d719
run branch check on PRs only
Hweinstock Dec 9, 2024
d03a2da
use event branch name
Hweinstock Dec 9, 2024
4fb8e66
change wording
Hweinstock Dec 9, 2024
cdecab6
add extra check
Hweinstock Dec 9, 2024
f2900e5
switch to single quotes
Hweinstock Dec 9, 2024
902de77
Merge branch 'aws:master' into master
Hweinstock Dec 9, 2024
bf03fd3
Merge branch 'aws:master' into master
Hweinstock Dec 10, 2024
4cd5400
Merge branch 'aws:master' into master
Hweinstock Dec 10, 2024
0234303
Merge branch 'aws:master' into master
Hweinstock Dec 11, 2024
f988458
Merge branch 'aws:master' into master
Hweinstock Dec 12, 2024
54be0b3
Merge branch 'aws:master' into master
Hweinstock Dec 12, 2024
d4f7dda
Merge branch 'aws:master' into master
Hweinstock Dec 12, 2024
b89ea57
change order of icons
Hweinstock Dec 12, 2024
1ec68bf
undo description change
Hweinstock Dec 12, 2024
56c8d62
use implicit sorting
Hweinstock Dec 12, 2024
8669065
apply suggestions
Hweinstock Dec 12, 2024
82d32b5
add space in vs code
Hweinstock Dec 12, 2024
ca791df
change back to open terminal
Hweinstock Dec 12, 2024
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
4 changes: 2 additions & 2 deletions packages/core/package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@
"AWS.command.refreshAwsExplorer": "Refresh Explorer",
"AWS.command.refreshCdkExplorer": "Refresh CDK Explorer",
"AWS.command.cdk.help": "View CDK Documentation",
"AWS.command.ec2.openTerminal": "Open terminal to EC2 instance...",
"AWS.command.ec2.openRemoteConnection": "Connect to EC2 instance in New Window...",
"AWS.command.ec2.openTerminal": "Connect Terminal to EC2 Instance...",
"AWS.command.ec2.openRemoteConnection": "Connect VS Code to EC2 Instance...",
Copy link
Contributor

@justinmk3 justinmk3 Dec 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normally we would avoid hardcoding the IDE name. But since vscode remote-ssh requires VSCode, this works for now.

"AWS.command.ec2.startInstance": "Start EC2 Instance",
"AWS.command.ec2.linkToLaunch": "Launch EC2 Instance",
"AWS.command.ec2.stopInstance": "Stop EC2 Instance",
Expand Down
4 changes: 2 additions & 2 deletions packages/toolkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,12 +1462,12 @@
},
{
"command": "aws.ec2.linkToLaunch",
"group": "0@1",
"group": "0@0",
Copy link
Contributor

@justinmk3 justinmk3 Dec 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this avoid the need for the command name changes? We probably should stick with Open Terminal if possible, since we use that in the command-palette names, and for ECS, CodeCatalyst, etc.

Copy link
Contributor Author

@Hweinstock Hweinstock Dec 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea it does, I can swap it back.

"when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
},
{
"command": "aws.ec2.linkToLaunch",
"group": "inline@1",
"group": "inline@0",
"when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
},
{
Expand Down
Loading