Skip to content

Commit ef71786

Browse files
justinmk3justinmk3
authored
Merge codecatalyst: update model, docs URLs
2 parents 35ec8bf + 52f6541 commit ef71786

File tree

5 files changed

+35
-90
lines changed

5 files changed

+35
-90
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
],
3131
"keywords": [
3232
"AWS",
33+
"CodeCatalyst",
3334
"CodeWhisperer",
3435
"Lambda",
3536
"Serverless"

‎src/credentials/auth.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { createCommonButtons, createExitButton, createHelpButton } from '../shar
3636
import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
3737
import { getCodeCatalystDevEnvId } from '../shared/vscode/env'
3838
import { getConfigFilename } from './sharedCredentials'
39-
import { credentialHelpUrl } from '../shared/constants'
39+
import { authHelpUrl } from '../shared/constants'
4040

4141
export const builderIdStartUrl = 'https://view.awsapps.com/start'
4242
export const ssoScope = 'sso:account:access'
@@ -906,7 +906,7 @@ export async function createBuilderIdConnection(auth: Auth) {
906906
}
907907

908908
Commands.register('aws.auth.help', async () => {
909-
vscode.env.openExternal(vscode.Uri.parse(credentialHelpUrl))
909+
vscode.env.openExternal(vscode.Uri.parse(authHelpUrl))
910910
telemetry.aws_help.emit()
911911
})
912912
Commands.register('aws.auth.signout', () => {

‎src/credentials/credentialsUtilities.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const localize = nls.loadMessageBundle()
88

99
import * as vscode from 'vscode'
1010
import { Credentials } from '@aws-sdk/types'
11-
import { credentialHelpUrl } from '../shared/constants'
11+
import { authHelpUrl } from '../shared/constants'
1212
import { Profile } from '../shared/credentials/credentialsFile'
1313
import globals from '../shared/extensionGlobals'
1414
import { isCloud9 } from '../shared/extensionUtilities'
@@ -45,7 +45,7 @@ export function showLoginFailedMessage(credentialsId: string, errMsg: string): v
4545
buttons
4646
).then((selection: string | undefined) => {
4747
if (selection === getHelp) {
48-
vscode.env.openExternal(vscode.Uri.parse(credentialHelpUrl))
48+
vscode.env.openExternal(vscode.Uri.parse(authHelpUrl))
4949
}
5050
if (selection === editCreds) {
5151
vscode.commands.executeCommand('aws.credentials.edit')

‎src/shared/constants.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ export const githubCreateIssueUrl = `${githubUrl}/issues/new/choose`
2222
export const documentationUrl: string = isCloud9()
2323
? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/toolkit-welcome.html'
2424
: 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/welcome.html'
25+
/**
26+
* General help page to help users understand the different ways of connecting to AWS (AWS ID, IAM credentials, SSO).
27+
*
28+
* - alternative?: codecatalyst/latest/userguide/sign-up-create-resources.html
29+
*/
30+
export const authHelpUrl = 'https://docs.aws.amazon.com/general/latest/gr/differences-aws_builder_id.html'
2531
export const credentialHelpUrl: string =
2632
'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/setup-credentials.html'
2733
export const ssoCredentialsHelpUrl: string =

‎types/codecatalyst-2020-12-01.json‎

Lines changed: 24 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
"name": "ListDevEnvironments",
256256
"http": {
257257
"method": "POST",
258-
"requestUri": "/v1/spaces/{spaceName}/projects/{projectName}/devEnvironments/",
258+
"requestUri": "/v1/spaces/{spaceName}/projects/{projectName}/devEnvironments",
259259
"responseCode": 200
260260
},
261261
"input": { "shape": "ListDevEnvironmentsRequest" },
@@ -1092,16 +1092,8 @@
10921092
"ListAccessTokensRequest": {
10931093
"type": "structure",
10941094
"members": {
1095-
"maxResults": {
1096-
"shape": "ListAccessTokensRequestMaxResultsInteger",
1097-
"location": "querystring",
1098-
"locationName": "maxResults"
1099-
},
1100-
"nextToken": {
1101-
"shape": "ListAccessTokensRequestNextTokenString",
1102-
"location": "querystring",
1103-
"locationName": "nextToken"
1104-
}
1095+
"maxResults": { "shape": "ListAccessTokensRequestMaxResultsInteger" },
1096+
"nextToken": { "shape": "ListAccessTokensRequestNextTokenString" }
11051097
}
11061098
},
11071099
"ListAccessTokensRequestMaxResultsInteger": {
@@ -1111,22 +1103,17 @@
11111103
},
11121104
"ListAccessTokensRequestNextTokenString": {
11131105
"type": "string",
1114-
"max": 4000,
1106+
"max": 10000,
11151107
"min": 1
11161108
},
11171109
"ListAccessTokensResponse": {
11181110
"type": "structure",
11191111
"required": ["items"],
11201112
"members": {
11211113
"items": { "shape": "AccessTokenSummaries" },
1122-
"nextToken": { "shape": "ListAccessTokensResponseNextTokenString" }
1114+
"nextToken": { "shape": "String" }
11231115
}
11241116
},
1125-
"ListAccessTokensResponseNextTokenString": {
1126-
"type": "string",
1127-
"max": 4000,
1128-
"min": 1
1129-
},
11301117
"ListDevEnvironmentsRequest": {
11311118
"type": "structure",
11321119
"required": ["spaceName", "projectName"],
@@ -1154,22 +1141,17 @@
11541141
},
11551142
"ListDevEnvironmentsRequestNextTokenString": {
11561143
"type": "string",
1157-
"max": 2048,
1144+
"max": 10000,
11581145
"min": 1
11591146
},
11601147
"ListDevEnvironmentsResponse": {
11611148
"type": "structure",
11621149
"required": ["items"],
11631150
"members": {
11641151
"items": { "shape": "DevEnvironmentSummaryList" },
1165-
"nextToken": { "shape": "ListDevEnvironmentsResponseNextTokenString" }
1152+
"nextToken": { "shape": "String" }
11661153
}
11671154
},
1168-
"ListDevEnvironmentsResponseNextTokenString": {
1169-
"type": "string",
1170-
"max": 2048,
1171-
"min": 1
1172-
},
11731155
"ListEventLogsRequest": {
11741156
"type": "structure",
11751157
"required": ["spaceName", "startTime", "endTime"],
@@ -1179,31 +1161,11 @@
11791161
"location": "uri",
11801162
"locationName": "spaceName"
11811163
},
1182-
"startTime": {
1183-
"shape": "SyntheticTimestamp_date_time",
1184-
"location": "querystring",
1185-
"locationName": "startTime"
1186-
},
1187-
"endTime": {
1188-
"shape": "SyntheticTimestamp_date_time",
1189-
"location": "querystring",
1190-
"locationName": "endTime"
1191-
},
1192-
"eventName": {
1193-
"shape": "String",
1194-
"location": "querystring",
1195-
"locationName": "eventName"
1196-
},
1197-
"nextToken": {
1198-
"shape": "ListEventLogsRequestNextTokenString",
1199-
"location": "querystring",
1200-
"locationName": "nextToken"
1201-
},
1202-
"maxResults": {
1203-
"shape": "ListEventLogsRequestMaxResultsInteger",
1204-
"location": "querystring",
1205-
"locationName": "maxResults"
1206-
}
1164+
"startTime": { "shape": "SyntheticTimestamp_date_time" },
1165+
"endTime": { "shape": "SyntheticTimestamp_date_time" },
1166+
"eventName": { "shape": "String" },
1167+
"nextToken": { "shape": "ListEventLogsRequestNextTokenString" },
1168+
"maxResults": { "shape": "ListEventLogsRequestMaxResultsInteger" }
12071169
}
12081170
},
12091171
"ListEventLogsRequestMaxResultsInteger": {
@@ -1214,7 +1176,7 @@
12141176
},
12151177
"ListEventLogsRequestNextTokenString": {
12161178
"type": "string",
1217-
"max": 2048,
1179+
"max": 10000,
12181180
"min": 1
12191181
},
12201182
"ListEventLogsResponse": {
@@ -1234,16 +1196,8 @@
12341196
"location": "uri",
12351197
"locationName": "spaceName"
12361198
},
1237-
"nextToken": {
1238-
"shape": "ListProjectsRequestNextTokenString",
1239-
"location": "querystring",
1240-
"locationName": "nextToken"
1241-
},
1242-
"maxResults": {
1243-
"shape": "ListProjectsRequestMaxResultsInteger",
1244-
"location": "querystring",
1245-
"locationName": "maxResults"
1246-
},
1199+
"nextToken": { "shape": "ListProjectsRequestNextTokenString" },
1200+
"maxResults": { "shape": "ListProjectsRequestMaxResultsInteger" },
12471201
"filters": { "shape": "ProjectListFilters" }
12481202
}
12491203
},
@@ -1255,6 +1209,7 @@
12551209
},
12561210
"ListProjectsRequestNextTokenString": {
12571211
"type": "string",
1212+
"max": 10000,
12581213
"min": 1
12591214
},
12601215
"ListProjectsResponse": {
@@ -1293,16 +1248,8 @@
12931248
"location": "uri",
12941249
"locationName": "projectName"
12951250
},
1296-
"nextToken": {
1297-
"shape": "ListSourceRepositoriesRequestNextTokenString",
1298-
"location": "querystring",
1299-
"locationName": "nextToken"
1300-
},
1301-
"maxResults": {
1302-
"shape": "ListSourceRepositoriesRequestMaxResultsInteger",
1303-
"location": "querystring",
1304-
"locationName": "maxResults"
1305-
}
1251+
"nextToken": { "shape": "ListSourceRepositoriesRequestNextTokenString" },
1252+
"maxResults": { "shape": "ListSourceRepositoriesRequestMaxResultsInteger" }
13061253
}
13071254
},
13081255
"ListSourceRepositoriesRequestMaxResultsInteger": {
@@ -1313,6 +1260,7 @@
13131260
},
13141261
"ListSourceRepositoriesRequestNextTokenString": {
13151262
"type": "string",
1263+
"max": 10000,
13161264
"min": 1
13171265
},
13181266
"ListSourceRepositoriesResponse": {
@@ -1354,16 +1302,8 @@
13541302
"location": "uri",
13551303
"locationName": "sourceRepositoryName"
13561304
},
1357-
"nextToken": {
1358-
"shape": "ListSourceRepositoryBranchesRequestNextTokenString",
1359-
"location": "querystring",
1360-
"locationName": "nextToken"
1361-
},
1362-
"maxResults": {
1363-
"shape": "ListSourceRepositoryBranchesRequestMaxResultsInteger",
1364-
"location": "querystring",
1365-
"locationName": "maxResults"
1366-
}
1305+
"nextToken": { "shape": "ListSourceRepositoryBranchesRequestNextTokenString" },
1306+
"maxResults": { "shape": "ListSourceRepositoryBranchesRequestMaxResultsInteger" }
13671307
}
13681308
},
13691309
"ListSourceRepositoryBranchesRequestMaxResultsInteger": {
@@ -1374,6 +1314,7 @@
13741314
},
13751315
"ListSourceRepositoryBranchesRequestNextTokenString": {
13761316
"type": "string",
1317+
"max": 10000,
13771318
"min": 1
13781319
},
13791320
"ListSourceRepositoryBranchesResponse": {
@@ -1386,15 +1327,12 @@
13861327
"ListSpacesRequest": {
13871328
"type": "structure",
13881329
"members": {
1389-
"nextToken": {
1390-
"shape": "ListSpacesRequestNextTokenString",
1391-
"location": "querystring",
1392-
"locationName": "nextToken"
1393-
}
1330+
"nextToken": { "shape": "ListSpacesRequestNextTokenString" }
13941331
}
13951332
},
13961333
"ListSpacesRequestNextTokenString": {
13971334
"type": "string",
1335+
"max": 10000,
13981336
"min": 1
13991337
},
14001338
"ListSpacesResponse": {

0 commit comments

Comments
 (0)