Skip to content

Commit 0090c5d

Browse files
author
Apurva
authored
Merge branch 'feature/starling' into autoMerge/feature/starling
2 parents aa2209b + 6a3f6be commit 0090c5d

25 files changed

+1166
-34
lines changed

‎.changes/next-release/Feature-9f183b3e-7500-4987-bca8-fddd600dccb9.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "AppComposer - Enable GenAI to suggest CFN Resource Definitions"
4+
}

‎.changes/next-release/Feature-ec2b6fdb-5127-4bbc-9f94-059564b06c6b.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "add application composer icons"
4+
}

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 84 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,10 @@
12481248
"command": "aws.dev.openMenu",
12491249
"when": "aws.isDevMode || isCloud9"
12501250
},
1251+
{
1252+
"command": "aws.openInApplicationComposer",
1253+
"when": "false"
1254+
},
12511255
{
12521256
"command": "aws.amazonq.learnMore",
12531257
"when": "false"
@@ -1298,6 +1302,11 @@
12981302
"command": "aws.resources.saveResource",
12991303
"when": "resourcePath =~ /^.+(awsResource.json)$/",
13001304
"group": "navigation"
1305+
},
1306+
{
1307+
"command": "aws.openInApplicationComposer",
1308+
"when": "editorLangId == json || editorLangId == yaml || resourceFilename =~ /^.*\\.(template)$/",
1309+
"group": "navigation"
13011310
}
13021311
],
13031312
"editor/title/context": [
@@ -1486,6 +1495,11 @@
14861495
"command": "aws.uploadLambda",
14871496
"when": "explorerResourceIsFolder || isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
14881497
"group": "z_aws@3"
1498+
},
1499+
{
1500+
"command": "aws.openInApplicationComposer",
1501+
"when": "isFileSystemResource && resourceFilename =~ /^.*\\.(json|yml|yaml|template)$/",
1502+
"group": "z_aws@1"
14891503
}
14901504
],
14911505
"amazonqEditorContextSubmenu": [
@@ -3731,6 +3745,30 @@
37313745
"category": "AWS (Developer)",
37323746
"enablement": "aws.isDevMode"
37333747
},
3748+
{
3749+
"command": "aws.openInApplicationComposerDialog",
3750+
"title": "%AWS.command.applicationComposer.openDialog%",
3751+
"category": "%AWS.title%",
3752+
"cloud9": {
3753+
"cn": {
3754+
"category": "%AWS.title.cn%"
3755+
}
3756+
}
3757+
},
3758+
{
3759+
"command": "aws.openInApplicationComposer",
3760+
"title": "%AWS.command.applicationComposer.open%",
3761+
"category": "%AWS.title%",
3762+
"icon": {
3763+
"dark": "resources/icons/aws/applicationcomposer/icon-dark.svg",
3764+
"light": "resources/icons/aws/applicationcomposer/icon.svg"
3765+
},
3766+
"cloud9": {
3767+
"cn": {
3768+
"category": "%AWS.title.cn%"
3769+
}
3770+
}
3771+
},
37343772
{
37353773
"command": "aws.amazonq.startTransformationInHub",
37363774
"title": "Start Transformation",
@@ -3943,222 +3981,236 @@
39433981
"fontCharacter": "\\f1ad"
39443982
}
39453983
},
3946-
"aws-apprunner-service": {
3984+
"aws-applicationcomposer-icon": {
39473985
"description": "AWS Contributed Icon",
39483986
"default": {
39493987
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39503988
"fontCharacter": "\\f1ae"
39513989
}
39523990
},
3953-
"aws-cdk-logo": {
3991+
"aws-applicationcomposer-icon-dark": {
39543992
"description": "AWS Contributed Icon",
39553993
"default": {
39563994
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39573995
"fontCharacter": "\\f1af"
39583996
}
39593997
},
3960-
"aws-cloudformation-stack": {
3998+
"aws-apprunner-service": {
39613999
"description": "AWS Contributed Icon",
39624000
"default": {
39634001
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39644002
"fontCharacter": "\\f1b0"
39654003
}
39664004
},
3967-
"aws-cloudwatch-log-group": {
4005+
"aws-cdk-logo": {
39684006
"description": "AWS Contributed Icon",
39694007
"default": {
39704008
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39714009
"fontCharacter": "\\f1b1"
39724010
}
39734011
},
3974-
"aws-codecatalyst-logo": {
4012+
"aws-cloudformation-stack": {
39754013
"description": "AWS Contributed Icon",
39764014
"default": {
39774015
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39784016
"fontCharacter": "\\f1b2"
39794017
}
39804018
},
3981-
"aws-codewhisperer-icon-black": {
4019+
"aws-cloudwatch-log-group": {
39824020
"description": "AWS Contributed Icon",
39834021
"default": {
39844022
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39854023
"fontCharacter": "\\f1b3"
39864024
}
39874025
},
3988-
"aws-codewhisperer-icon-white": {
4026+
"aws-codecatalyst-logo": {
39894027
"description": "AWS Contributed Icon",
39904028
"default": {
39914029
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39924030
"fontCharacter": "\\f1b4"
39934031
}
39944032
},
3995-
"aws-codewhisperer-learn": {
4033+
"aws-codewhisperer-icon-black": {
39964034
"description": "AWS Contributed Icon",
39974035
"default": {
39984036
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
39994037
"fontCharacter": "\\f1b5"
40004038
}
40014039
},
4002-
"aws-ecr-registry": {
4040+
"aws-codewhisperer-icon-white": {
40034041
"description": "AWS Contributed Icon",
40044042
"default": {
40054043
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40064044
"fontCharacter": "\\f1b6"
40074045
}
40084046
},
4009-
"aws-ecs-cluster": {
4047+
"aws-codewhisperer-learn": {
40104048
"description": "AWS Contributed Icon",
40114049
"default": {
40124050
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40134051
"fontCharacter": "\\f1b7"
40144052
}
40154053
},
4016-
"aws-ecs-container": {
4054+
"aws-ecr-registry": {
40174055
"description": "AWS Contributed Icon",
40184056
"default": {
40194057
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40204058
"fontCharacter": "\\f1b8"
40214059
}
40224060
},
4023-
"aws-ecs-service": {
4061+
"aws-ecs-cluster": {
40244062
"description": "AWS Contributed Icon",
40254063
"default": {
40264064
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40274065
"fontCharacter": "\\f1b9"
40284066
}
40294067
},
4030-
"aws-generic-attach-file": {
4068+
"aws-ecs-container": {
40314069
"description": "AWS Contributed Icon",
40324070
"default": {
40334071
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40344072
"fontCharacter": "\\f1ba"
40354073
}
40364074
},
4037-
"aws-iot-certificate": {
4075+
"aws-ecs-service": {
40384076
"description": "AWS Contributed Icon",
40394077
"default": {
40404078
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40414079
"fontCharacter": "\\f1bb"
40424080
}
40434081
},
4044-
"aws-iot-policy": {
4082+
"aws-generic-attach-file": {
40454083
"description": "AWS Contributed Icon",
40464084
"default": {
40474085
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40484086
"fontCharacter": "\\f1bc"
40494087
}
40504088
},
4051-
"aws-iot-thing": {
4089+
"aws-iot-certificate": {
40524090
"description": "AWS Contributed Icon",
40534091
"default": {
40544092
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40554093
"fontCharacter": "\\f1bd"
40564094
}
40574095
},
4058-
"aws-lambda-function": {
4096+
"aws-iot-policy": {
40594097
"description": "AWS Contributed Icon",
40604098
"default": {
40614099
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40624100
"fontCharacter": "\\f1be"
40634101
}
40644102
},
4065-
"aws-mynah-MynahIconBlack": {
4103+
"aws-iot-thing": {
40664104
"description": "AWS Contributed Icon",
40674105
"default": {
40684106
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40694107
"fontCharacter": "\\f1bf"
40704108
}
40714109
},
4072-
"aws-mynah-MynahIconWhite": {
4110+
"aws-lambda-function": {
40734111
"description": "AWS Contributed Icon",
40744112
"default": {
40754113
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40764114
"fontCharacter": "\\f1c0"
40774115
}
40784116
},
4079-
"aws-mynah-logo": {
4117+
"aws-mynah-MynahIconBlack": {
40804118
"description": "AWS Contributed Icon",
40814119
"default": {
40824120
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40834121
"fontCharacter": "\\f1c1"
40844122
}
40854123
},
4086-
"aws-redshift-cluster": {
4124+
"aws-mynah-MynahIconWhite": {
40874125
"description": "AWS Contributed Icon",
40884126
"default": {
40894127
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40904128
"fontCharacter": "\\f1c2"
40914129
}
40924130
},
4093-
"aws-redshift-cluster-connected": {
4131+
"aws-mynah-logo": {
40944132
"description": "AWS Contributed Icon",
40954133
"default": {
40964134
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
40974135
"fontCharacter": "\\f1c3"
40984136
}
40994137
},
4100-
"aws-redshift-database": {
4138+
"aws-redshift-cluster": {
41014139
"description": "AWS Contributed Icon",
41024140
"default": {
41034141
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41044142
"fontCharacter": "\\f1c4"
41054143
}
41064144
},
4107-
"aws-redshift-redshift-cluster-connected": {
4145+
"aws-redshift-cluster-connected": {
41084146
"description": "AWS Contributed Icon",
41094147
"default": {
41104148
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41114149
"fontCharacter": "\\f1c5"
41124150
}
41134151
},
4114-
"aws-redshift-schema": {
4152+
"aws-redshift-database": {
41154153
"description": "AWS Contributed Icon",
41164154
"default": {
41174155
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41184156
"fontCharacter": "\\f1c6"
41194157
}
41204158
},
4121-
"aws-redshift-table": {
4159+
"aws-redshift-redshift-cluster-connected": {
41224160
"description": "AWS Contributed Icon",
41234161
"default": {
41244162
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41254163
"fontCharacter": "\\f1c7"
41264164
}
41274165
},
4128-
"aws-s3-bucket": {
4166+
"aws-redshift-schema": {
41294167
"description": "AWS Contributed Icon",
41304168
"default": {
41314169
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41324170
"fontCharacter": "\\f1c8"
41334171
}
41344172
},
4135-
"aws-s3-create-bucket": {
4173+
"aws-redshift-table": {
41364174
"description": "AWS Contributed Icon",
41374175
"default": {
41384176
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41394177
"fontCharacter": "\\f1c9"
41404178
}
41414179
},
4142-
"aws-schemas-registry": {
4180+
"aws-s3-bucket": {
41434181
"description": "AWS Contributed Icon",
41444182
"default": {
41454183
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41464184
"fontCharacter": "\\f1ca"
41474185
}
41484186
},
4149-
"aws-schemas-schema": {
4187+
"aws-s3-create-bucket": {
41504188
"description": "AWS Contributed Icon",
41514189
"default": {
41524190
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41534191
"fontCharacter": "\\f1cb"
41544192
}
41554193
},
4156-
"aws-stepfunctions-preview": {
4194+
"aws-schemas-registry": {
41574195
"description": "AWS Contributed Icon",
41584196
"default": {
41594197
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
41604198
"fontCharacter": "\\f1cc"
41614199
}
4200+
},
4201+
"aws-schemas-schema": {
4202+
"description": "AWS Contributed Icon",
4203+
"default": {
4204+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
4205+
"fontCharacter": "\\f1cd"
4206+
}
4207+
},
4208+
"aws-stepfunctions-preview": {
4209+
"description": "AWS Contributed Icon",
4210+
"default": {
4211+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
4212+
"fontCharacter": "\\f1ce"
4213+
}
41624214
}
41634215
},
41644216
"notebooks": [
@@ -4228,7 +4280,7 @@
42284280
"@types/mime-types": "^2.1.1",
42294281
"@types/mocha": "^10.0.0",
42304282
"@types/node": "^14.18.63",
4231-
"@types/node-fetch": "^2.6.6",
4283+
"@types/node-fetch": "^2.6.8",
42324284
"@types/prismjs": "^1.26.0",
42334285
"@types/proxyquire": "^1.3.31",
42344286
"@types/readline-sync": "^1.4.3",

‎package.nls.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
"AWS.command.apig.copyUrl": "Copy URL",
7777
"AWS.command.apig.invokeRemoteRestApi": "Invoke on AWS",
7878
"AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",
79+
"AWS.command.applicationComposer.open": "Open with Application Composer",
80+
"AWS.command.applicationComposer.openDialog": "Open Template with Application Composer...",
7981
"AWS.command.auth.addConnection": "Add New Connection",
8082
"AWS.command.auth.showConnectionsPage": "Add New Connection",
8183
"AWS.command.auth.switchConnections": "Switch Connections",

‎resources/icons/aws/applicationcomposer/icon-dark.svg‎

Lines changed: 7 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)