Skip to content

Commit 41b346e

Browse files
committed
Merge feature/vector
2 parents 1aa5268 + a470672 commit 41b346e

File tree

58 files changed

+3637
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3637
-42
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "Amazon Redshift is now available in AWS Explorer. You can author and execute SQL queries from VS Code notebooks, and view your database objects in their Redshift warehouses."
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "Public preview for CodeWhisperer Enterprise: Enterprise customers can now customize CodeWhisperer to adopt and suggest code based on organization specific codebases."
4+
}

README.quickstart.vscode.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Unified software development service to quickly build and deliver applications o
4848

4949
## More features
5050

51+
- **Redshift** - view database objects and run SQL queries in a notebook interface
5152
- **Step Functions** - work with asl files and render state machine visuals
5253
- **CloudFormation** - view CloudFormation stacks
5354
- **API Gateway** - invoke an API gateway endpoint

docs/api.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# AWS Toolkit API
2+
3+
Details about any publicly accessible functionalities exposed through [extension commands](https://code.visualstudio.com/api/references/vscode-api#commands) or [exported APIs](https://code.visualstudio.com/api/references/vscode-api#extensions).
4+
5+
## Pseudo (Internal-only) API
6+
7+
### Commands
8+
9+
#### `aws.codeWhisperer.connect`
10+
11+
**Signature**: _async (startUrl?: string, region?: string, customizationArn?: string, customizationName?: string, customizationDescription?: string) => Promise<void>_
12+
13+
Shortcut command to directly connect to Identity Center or prompt start URL entry, as well as set a customization for CodeWhisperer requests.
14+
15+
This command supports two sets of arguments:
16+
17+
- startUrl and region. If both arguments are provided they will be used, otherwise the command prompts for them interactively.
18+
- customization{Arn, Name, Description}. If at least customizationArn is provided, the command selects this customization.

package.json

Lines changed: 87 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,14 @@
965965
"command": "aws.deploySamApplication",
966966
"when": "config.aws.samcli.legacyDeploy"
967967
},
968+
{
969+
"command": "aws.redshift.editConnection",
970+
"when": "false"
971+
},
972+
{
973+
"command": "aws.redshift.deleteConnection",
974+
"when": "false"
975+
},
968976
{
969977
"command": "aws.samcli.sync",
970978
"when": "!config.aws.samcli.legacyDeploy"
@@ -1410,6 +1418,16 @@
14101418
"when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
14111419
"group": "inline@1"
14121420
},
1421+
{
1422+
"command": "aws.redshift.editConnection",
1423+
"when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
1424+
"group": "0@1"
1425+
},
1426+
{
1427+
"command": "aws.redshift.deleteConnection",
1428+
"when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
1429+
"group": "0@2"
1430+
},
14131431
{
14141432
"command": "aws.s3.openFile",
14151433
"when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
@@ -2438,6 +2456,16 @@
24382456
}
24392457
}
24402458
},
2459+
{
2460+
"command": "aws.redshift.editConnection",
2461+
"title": "Edit connection",
2462+
"category": "%AWS.title%"
2463+
},
2464+
{
2465+
"command": "aws.redshift.deleteConnection",
2466+
"title": "Delete connection",
2467+
"category": "%AWS.title%"
2468+
},
24412469
{
24422470
"command": "aws.s3.presignedURL",
24432471
"title": "%AWS.command.s3.presignedURL%",
@@ -3526,42 +3554,95 @@
35263554
"fontCharacter": "\\f1b8"
35273555
}
35283556
},
3529-
"aws-s3-bucket": {
3557+
"aws-redshift-cluster": {
35303558
"description": "AWS Contributed Icon",
35313559
"default": {
35323560
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35333561
"fontCharacter": "\\f1b9"
35343562
}
35353563
},
3536-
"aws-s3-create-bucket": {
3564+
"aws-redshift-cluster-connected": {
35373565
"description": "AWS Contributed Icon",
35383566
"default": {
35393567
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35403568
"fontCharacter": "\\f1ba"
35413569
}
35423570
},
3543-
"aws-schemas-registry": {
3571+
"aws-redshift-database": {
35443572
"description": "AWS Contributed Icon",
35453573
"default": {
35463574
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35473575
"fontCharacter": "\\f1bb"
35483576
}
35493577
},
3550-
"aws-schemas-schema": {
3578+
"aws-redshift-redshift-cluster-connected": {
35513579
"description": "AWS Contributed Icon",
35523580
"default": {
35533581
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35543582
"fontCharacter": "\\f1bc"
35553583
}
35563584
},
3557-
"aws-stepfunctions-preview": {
3585+
"aws-redshift-schema": {
35583586
"description": "AWS Contributed Icon",
35593587
"default": {
35603588
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35613589
"fontCharacter": "\\f1bd"
35623590
}
3591+
},
3592+
"aws-redshift-table": {
3593+
"description": "AWS Contributed Icon",
3594+
"default": {
3595+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
3596+
"fontCharacter": "\\f1be"
3597+
}
3598+
},
3599+
"aws-s3-bucket": {
3600+
"description": "AWS Contributed Icon",
3601+
"default": {
3602+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
3603+
"fontCharacter": "\\f1bf"
3604+
}
3605+
},
3606+
"aws-s3-create-bucket": {
3607+
"description": "AWS Contributed Icon",
3608+
"default": {
3609+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
3610+
"fontCharacter": "\\f1c0"
3611+
}
3612+
},
3613+
"aws-schemas-registry": {
3614+
"description": "AWS Contributed Icon",
3615+
"default": {
3616+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
3617+
"fontCharacter": "\\f1c1"
3618+
}
3619+
},
3620+
"aws-schemas-schema": {
3621+
"description": "AWS Contributed Icon",
3622+
"default": {
3623+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
3624+
"fontCharacter": "\\f1c2"
3625+
}
3626+
},
3627+
"aws-stepfunctions-preview": {
3628+
"description": "AWS Contributed Icon",
3629+
"default": {
3630+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
3631+
"fontCharacter": "\\f1c3"
3632+
}
3633+
}
3634+
},
3635+
"notebooks": [
3636+
{
3637+
"type": "aws-redshift-sql-notebook",
3638+
"displayName": "Redshift SQL notebook",
3639+
"selector": [
3640+
{
3641+
"filenamePattern": "*.redshiftnb"
3642+
}
3643+
]
35633644
}
3564-
}
3645+
]
35653646
},
35663647
"scripts": {
35673648
"prepare": "ts-node ./scripts/build/prepare.ts",

package.nls.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,5 +216,14 @@
216216
"AWS.walkthrough.gettingStarted.connect": "Connect to AWS",
217217
"AWS.walkthrough.gettingStarted.changeRegions": "Change AWS Regions",
218218
"AWS.walkthrough.gettingStarted.setupToolchain": "Configure your toolchain",
219-
"AWS.command.codewhisperer.title": "CodeWhisperer Invoke Service"
219+
"AWS.command.codewhisperer.title": "CodeWhisperer Invoke Service",
220+
"AWS.explorerNode.selectCustomization.label": "Select a Customization",
221+
"AWS.codewhisperer.customization.base.label": "CodeWhisperer foundation (Default)",
222+
"AWS.codewhisperer.customization.base.description": "default",
223+
"AWS.codewhisperer.customization.base.detail": "Receive suggestions from CodeWhisperer base model",
224+
"AWS.codewhisperer.customization.selected": "Connected",
225+
"AWS.codewhisperer.customization.quickPick.title": "Select a Customization",
226+
"AWS.codewhisperer.customization.quickPick.placeholder": "You have access to the following customizations",
227+
"AWS.codewhisperer.customization.notification.new_customizations.select": "Select Customization",
228+
"AWS.codewhisperer.customization.notification.new_customizations.learn_more": "Learn More"
220229
}
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)