Skip to content

Commit c8f51ff

Browse files
laileni-awslaileni-aws
authored
Merge branch 'aws:master' into master
2 parents 3741f86 + 4c0a768 commit c8f51ff

Some content is hidden

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

41 files changed

+1629
-147
lines changed

‎.changes/next-release/Deprecation-f9d02208-eb97-4c44-810c-013fabb4a7d9.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Deprecation",
3+
"description": "SAM: removed support for .NET core 3.1 [Lambda runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html)"
4+
}

‎.changes/next-release/Feature-b17bd945-88d8-4b18-94e8-49e8844c18b9.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": "CodeWhisperer: new onboarding tutorial for first-time users"
4+
}

‎package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@
218218
"type": "boolean",
219219
"default": false
220220
},
221+
"codeWhispererNewWelcomeMessage": {
222+
"type": "boolean",
223+
"default": false
224+
},
221225
"codeWhispererConnectionExpired": {
222226
"type": "boolean",
223227
"default": false
@@ -3452,103 +3456,110 @@
34523456
"fontCharacter": "\\f1ae"
34533457
}
34543458
},
3455-
"aws-ecr-registry": {
3459+
"aws-codewhisperer-learn": {
34563460
"description": "AWS Contributed Icon",
34573461
"default": {
34583462
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
34593463
"fontCharacter": "\\f1af"
34603464
}
34613465
},
3462-
"aws-ecs-cluster": {
3466+
"aws-ecr-registry": {
34633467
"description": "AWS Contributed Icon",
34643468
"default": {
34653469
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
34663470
"fontCharacter": "\\f1b0"
34673471
}
34683472
},
3469-
"aws-ecs-container": {
3473+
"aws-ecs-cluster": {
34703474
"description": "AWS Contributed Icon",
34713475
"default": {
34723476
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
34733477
"fontCharacter": "\\f1b1"
34743478
}
34753479
},
3476-
"aws-ecs-service": {
3480+
"aws-ecs-container": {
34773481
"description": "AWS Contributed Icon",
34783482
"default": {
34793483
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
34803484
"fontCharacter": "\\f1b2"
34813485
}
34823486
},
3483-
"aws-generic-attach-file": {
3487+
"aws-ecs-service": {
34843488
"description": "AWS Contributed Icon",
34853489
"default": {
34863490
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
34873491
"fontCharacter": "\\f1b3"
34883492
}
34893493
},
3490-
"aws-iot-certificate": {
3494+
"aws-generic-attach-file": {
34913495
"description": "AWS Contributed Icon",
34923496
"default": {
34933497
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
34943498
"fontCharacter": "\\f1b4"
34953499
}
34963500
},
3497-
"aws-iot-policy": {
3501+
"aws-iot-certificate": {
34983502
"description": "AWS Contributed Icon",
34993503
"default": {
35003504
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35013505
"fontCharacter": "\\f1b5"
35023506
}
35033507
},
3504-
"aws-iot-thing": {
3508+
"aws-iot-policy": {
35053509
"description": "AWS Contributed Icon",
35063510
"default": {
35073511
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35083512
"fontCharacter": "\\f1b6"
35093513
}
35103514
},
3511-
"aws-lambda-function": {
3515+
"aws-iot-thing": {
35123516
"description": "AWS Contributed Icon",
35133517
"default": {
35143518
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35153519
"fontCharacter": "\\f1b7"
35163520
}
35173521
},
3518-
"aws-s3-bucket": {
3522+
"aws-lambda-function": {
35193523
"description": "AWS Contributed Icon",
35203524
"default": {
35213525
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35223526
"fontCharacter": "\\f1b8"
35233527
}
35243528
},
3525-
"aws-s3-create-bucket": {
3529+
"aws-s3-bucket": {
35263530
"description": "AWS Contributed Icon",
35273531
"default": {
35283532
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35293533
"fontCharacter": "\\f1b9"
35303534
}
35313535
},
3532-
"aws-schemas-registry": {
3536+
"aws-s3-create-bucket": {
35333537
"description": "AWS Contributed Icon",
35343538
"default": {
35353539
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35363540
"fontCharacter": "\\f1ba"
35373541
}
35383542
},
3539-
"aws-schemas-schema": {
3543+
"aws-schemas-registry": {
35403544
"description": "AWS Contributed Icon",
35413545
"default": {
35423546
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35433547
"fontCharacter": "\\f1bb"
35443548
}
35453549
},
3546-
"aws-stepfunctions-preview": {
3550+
"aws-schemas-schema": {
35473551
"description": "AWS Contributed Icon",
35483552
"default": {
35493553
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
35503554
"fontCharacter": "\\f1bc"
35513555
}
3556+
},
3557+
"aws-stepfunctions-preview": {
3558+
"description": "AWS Contributed Icon",
3559+
"default": {
3560+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
3561+
"fontCharacter": "\\f1bd"
3562+
}
35523563
}
35533564
}
35543565
},
@@ -3583,7 +3594,7 @@
35833594
"report": "nyc report --reporter=html --reporter=json"
35843595
},
35853596
"devDependencies": {
3586-
"@aws-toolkits/telemetry": "^1.0.143",
3597+
"@aws-toolkits/telemetry": "^1.0.144",
35873598
"@cspotcode/source-map-support": "^0.8.1",
35883599
"@sinonjs/fake-timers": "^10.0.2",
35893600
"@types/adm-zip": "^0.4.34",

‎resources/icons/aws/codewhisperer/learn.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎src/auth/ui/vue/authForms/manageIdentityCenter.vue‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,14 @@ export default defineComponent({
134134
async signin(): Promise<void> {
135135
await client.startAuthFormInteraction(this.state.featureType, 'iamIdentityCenter')
136136
137-
// Error checks
137+
// Return without actually submitting if the form has errors before submitting
138138
this.updateEmptyFieldErrors()
139139
const fieldsWithError = this.processFieldsWithError()
140-
if (fieldsWithError.length > 0) {
140+
// If there is an error in the submission field from a previous attempt we want to allow them to try submitting again
141+
// without needing to update the form. There are cases where they may not need to update the form (eg: cancelled manually)
142+
// and should be able to submit again
143+
const submitErrorExcluded = fieldsWithError.filter(field => field !== 'submit')
144+
if (submitErrorExcluded.length > 0) {
141145
client.failedAuthAttempt({
142146
authType: 'iamIdentityCenter',
143147
featureType: this.state.featureType,

‎src/awsexplorer/activation.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,12 @@ async function registerAwsExplorerCommands(
119119
telemetry.vscode_activeRegions.emit({ value: awsExplorer.getRegionNodesSize() })
120120
}
121121
}),
122-
Commands.register({ id: 'aws.submitFeedback', autoconnect: false }, async () => {
123-
await submitFeedback(context)
122+
Commands.register({ id: 'aws.submitFeedback', autoconnect: false }, async id => {
123+
if (id === 'CodeWhisperer') {
124+
await submitFeedback(context, 'CodeWhisperer')
125+
} else {
126+
await submitFeedback(context, 'AWS Toolkit')
127+
}
124128
}),
125129
Commands.register({ id: 'aws.refreshAwsExplorer', autoconnect: true }, async (passive: boolean = false) => {
126130
awsExplorer.refresh()

‎src/codewhisperer/activation.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ import { ReferenceInlineProvider } from './service/referenceInlineProvider'
4141
import { SecurityPanelViewProvider } from './views/securityPanelViewProvider'
4242
import { disposeSecurityDiagnostic } from './service/diagnosticsProvider'
4343
import { RecommendationHandler } from './service/recommendationHandler'
44-
import { Commands } from '../shared/vscode/commands2'
44+
import { Commands, registerCommandsWithVSCode } from '../shared/vscode/commands2'
4545
import { InlineCompletionService } from './service/inlineCompletionService'
4646
import { isInlineCompletionEnabled } from './util/commonUtil'
4747
import { CodeWhispererCodeCoverageTracker } from './tracker/codewhispererCodeCoverageTracker'
4848
import { AuthUtil } from './util/authUtil'
4949
import { ImportAdderProvider } from './service/importAdderProvider'
5050
import { TelemetryHelper } from './util/telemetryHelper'
5151
import { openUrl } from '../shared/utilities/vsCodeUtils'
52-
52+
import { CodeWhispererCommandBackend, CodeWhispererCommandDeclarations } from './commands/gettingStartedPageCommands'
5353
const performance = globalThis.performance ?? require('perf_hooks').performance
5454

5555
export async function activate(context: ExtContext): Promise<void> {
@@ -64,6 +64,12 @@ export async function activate(context: ExtContext): Promise<void> {
6464
await enableDefaultConfigCloud9()
6565
}
6666

67+
registerCommandsWithVSCode(
68+
context.extensionContext,
69+
CodeWhispererCommandDeclarations.instance,
70+
new CodeWhispererCommandBackend(context.extensionContext)
71+
)
72+
6773
/**
6874
* CodeWhisperer security panel
6975
*/

‎src/codewhisperer/commands/basicCommands.ts‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ import { AuthUtil } from '../util/authUtil'
1919
import { isCloud9 } from '../../shared/extensionUtilities'
2020
import { InlineCompletionService } from '../service/inlineCompletionService'
2121
import { openUrl } from '../../shared/utilities/vsCodeUtils'
22+
import { CodeWhispererCommandDeclarations } from '../commands/gettingStartedPageCommands'
23+
import { getIcon } from '../../shared/icons'
24+
import { localize } from '../../shared/utilities/vsCodeUtils'
25+
import { PromptSettings } from '../../shared/settings'
2226

2327
export const toggleCodeSuggestions = Commands.declare(
2428
'aws.codeWhisperer.toggleCodeSuggestion',
@@ -35,21 +39,31 @@ export const toggleCodeSuggestions = Commands.declare(
3539
})
3640
}
3741
)
42+
/*
43+
createGettingStartedNode(Learn) will be a childnode of CodeWhisperer
44+
onClick on this "Learn" Node will open the Learn CodeWhisperer Page.
45+
*/
46+
export const createGettingStartedNode = () =>
47+
CodeWhispererCommandDeclarations.instance.declared.showGettingStartedPage
48+
.build('codewhispererDeveloperTools')
49+
.asTreeNode({
50+
label: localize('AWS.explorerNode.codewhispererGettingStartedNode.label', 'Learn'),
51+
iconPath: getIcon('aws-codewhisperer-learn'),
52+
})
3853

3954
export const enableCodeSuggestions = Commands.declare(
4055
'aws.codeWhisperer.enableCodeSuggestions',
4156
(context: ExtContext) => async () => {
4257
await set(CodeWhispererConstants.autoTriggerEnabledKey, true, context.extensionContext.globalState)
4358
await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', true)
4459
await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
60+
const prompts = PromptSettings.instance
4561

46-
const hasShownWelcomeMsgBefore = get(
47-
CodeWhispererConstants.welcomeMessageKey,
48-
context.extensionContext.globalState
49-
)
50-
if (!hasShownWelcomeMsgBefore) {
51-
showCodeWhispererWelcomeMessage(context)
52-
await set(CodeWhispererConstants.welcomeMessageKey, true, context.extensionContext.globalState)
62+
const shouldShow = await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')
63+
//If user login old or new, If welcome message is not shown then open the Getting Started Page after this mark it as SHOWN.
64+
if (shouldShow) {
65+
vscode.commands.executeCommand('aws.codeWhisperer.gettingStarted', createGettingStartedNode())
66+
prompts.update('codeWhispererNewWelcomeMessage', true)
5367
}
5468
if (!isCloud9()) {
5569
await vscode.commands.executeCommand('aws.codeWhisperer.refreshStatusBar')
@@ -132,14 +146,6 @@ export const updateReferenceLog = Commands.declare(
132146
}
133147
)
134148

135-
async function showCodeWhispererWelcomeMessage(context: ExtContext): Promise<void> {
136-
const filePath = isCloud9()
137-
? context.extensionContext.asAbsolutePath(CodeWhispererConstants.welcomeCodeWhispererCloud9Readme)
138-
: context.extensionContext.asAbsolutePath(CodeWhispererConstants.welcomeCodeWhispererReadmeFileSource)
139-
const readmeUri = vscode.Uri.file(filePath)
140-
await vscode.commands.executeCommand('markdown.showPreviewToSide', readmeUri)
141-
}
142-
143149
export const refreshStatusBar = Commands.declare(
144150
{ id: 'aws.codeWhisperer.refreshStatusBar', logging: false },
145151
() => () => {

‎src/codewhisperer/commands/gettingStartedPageCommands.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*!
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
import * as vscode from 'vscode'
6+
import { CommandDeclarations, Commands } from '../../shared/vscode/commands2'
7+
import { showCodeWhispererWebview, CodeWhispererSource } from '../vue/backend'
8+
import { telemetry } from '../../shared/telemetry/telemetry'
9+
import { PromptSettings } from '../../shared/settings'
10+
/**
11+
* The methods with backend logic for the Codewhisperer Getting Started Page commands.
12+
*/
13+
export class CodeWhispererCommandBackend {
14+
constructor(private readonly extContext: vscode.ExtensionContext) {}
15+
public async showGettingStartedPage(source: CodeWhispererSource) {
16+
const prompts = PromptSettings.instance
17+
//To check the condition If the user has already seen the welcome message
18+
if (!(await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage'))) {
19+
telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_ButtonClick', passive: true })
20+
}
21+
return showCodeWhispererWebview(this.extContext, source)
22+
}
23+
}
24+
/**
25+
* Declared commands related to CodeWhisperer in the toolkit.
26+
*/
27+
export class CodeWhispererCommandDeclarations implements CommandDeclarations<CodeWhispererCommandBackend> {
28+
static #instance: CodeWhispererCommandDeclarations
29+
30+
static get instance(): CodeWhispererCommandDeclarations {
31+
return (this.#instance ??= new CodeWhispererCommandDeclarations())
32+
}
33+
public readonly declared = {
34+
showGettingStartedPage: Commands.from(CodeWhispererCommandBackend).declareShowGettingStartedPage(
35+
'aws.codeWhisperer.gettingStarted'
36+
),
37+
} as const
38+
}

0 commit comments

Comments
 (0)