trying to invoke the lambda before the test suite starts

Author: laura-codess

.github/workflows/node.js.yml

@@ -214,3 +214,23 @@ jobs:
                   verbose: true
                   file: ./coverage/${{ matrix.package }}/lcov.info
                   token: ${{ secrets.CODECOV_TOKEN }}
+    e2e:
+        needs: lint-commits
+        name: test E2E
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node-version: [18.x]
+        env:
+            NODE_OPTIONS: '--max-old-space-size=8192'
+        steps:
+            - uses: actions/checkout@v4
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - run: npm ci
+            - name: E2E Tests
+              uses: coactions/setup-xvfb@v1
+              with:
+                  run: npm run test:ui

package.json

@@ -30,7 +30,7 @@
         "testE2E": "npm run testE2E -w packages/ --if-present",
         "test:ui:prepare": "./node_modules/.bin/extest get-vscode -s ~/.vscode-test-resources -n && extest get-chromedriver -s ~/.vscode-test-resources -n",
         "test:ui:install": "cd packages/amazonq && npm run package 2>&1 | grep -o 'VSIX Version: [^ ]*' | cut -d' ' -f3 | xargs -I{} bash -c 'cd ../../ && ./node_modules/.bin/extest install-vsix -f amazon-q-vscode-{}.vsix -e packages/amazonq/test/e2e_new/amazonq/resources -s ~/.vscode-test-resources'",
-        "test:ui:run": "npm run testCompile && ./node_modules/.bin/extest run-tests -s ~/.vscode-test-resources -e packages/amazonq/test/e2e_new/amazonq/resources packages/amazonq/dist/test/e2e_new/amazonq/tests/*.test.js 2>&1 | tee packages/amazonq/test/e2e_new/amazonq/logs/ui_e2e_testlog_$(date +%Y%m%d_%H%M%S).log",
+        "test:ui:run": "npm run testCompile && ./node_modules/.bin/extest run-tests -s ~/.vscode-test-resources -e packages/amazonq/test/e2e_new/amazonq/resources packages/amazonq/dist/test/e2e_new/amazonq/tests/*.test.js",
         "test:ui": "npm run test:ui:prepare && npm run test:ui:install && npm run test:ui:run",
         "testInteg": "npm run testInteg -w packages/ --if-present",
         "package": "npm run package -w packages/toolkit -w packages/amazonq",

packages/amazonq/test/e2e_new/amazonq/utils/authUtils.ts

@@ -5,6 +5,8 @@
 import { Workbench, By, WebviewView } from 'vscode-extension-tester'
 import { findItemByText, sleep, waitForElements } from './generalUtils'
 import { testContext } from './testContext'
+import { isRunningInGitHubActionsE2E } from './ciUtils'
+import { authenticateForCI } from './ciOidcClient'
 
 /* Completes the entire Amazon Q login flow
 
@@ -16,6 +18,18 @@ Currently, the function will
 
 TO-DO: Currently this signInToAmazonQ is not fully autonomous as we ran into a blocker when the browser window pops up */
 export async function signInToAmazonQ(): Promise<void> {
+    if (isRunningInGitHubActionsE2E()) {
+        console.log('CI Environment detected: Using automated authentication')
+        await authenticateForCI()
+
+        // Set up minimal test context for CI
+        const workbench = new Workbench()
+        testContext.workbench = workbench
+        // Skip webview setup for CI as authentication is handled by Lambda
+        return
+    }
+
+    // Normal manual authentication flow for local development
     const workbench = new Workbench()
     await workbench.executeCommand('Amazon Q: Open Chat')
 
@@ -45,6 +59,7 @@ export async function signInToAmazonQ(): Promise<void> {
     console.log('Waiting for manual authentication...')
     await sleep(12000)
     console.log('Manual authentication should be done')
+
     await webviewView.switchBack()
 
     const editorView = workbench.getEditorView()

packages/amazonq/test/e2e_new/amazonq/utils/ciOidcClient.ts

@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { isRunningInGitHubActionsE2E, invokeAuthLambda } from './ciUtils'
+
+/**
+ * CI-specific authentication that bypasses browser interaction
+ */
+export async function authenticateForCI(): Promise<void> {
+    if (!isRunningInGitHubActionsE2E()) {
+        throw new Error('This function should only be called in CI environments')
+    }
+
+    // Mock the device authorization flow for CI
+    const mockUserCode = 'CI_AUTO_CODE'
+    const mockVerificationUri = 'https://amzn.awsapps.com/start'
+
+    console.log('CI Authentication: Invoking Lambda with mock device authorization')
+    await invokeAuthLambda(mockUserCode, mockVerificationUri)
+
+    // Give the Lambda time to complete the authentication
+    await new Promise((resolve) => setTimeout(resolve, 10000))
+
+    console.log('CI Authentication: Lambda invocation completed')
+}

packages/amazonq/test/e2e_new/amazonq/utils/ciUtils.ts

@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+interface AuthorizeRequest {
+    readonly secret: string
+    readonly userCode: string
+    readonly verificationUri: string
+}
+
+/**
+ * Checks if the current environment is running in GitHub Actions CI for e2e tests
+ */
+export function isRunningInGitHubActionsE2E(): boolean {
+    return (
+        process.env.GITHUB_ACTIONS === 'true' &&
+        process.env.CI === 'true' &&
+        (process.env.GITHUB_JOB?.includes('e2e') === true ||
+            process.env.GITHUB_WORKFLOW?.toLowerCase().includes('e2e') === true)
+    )
+}
+
+/**
+ * Invokes the auth Lambda function for CI automation
+ */
+export async function invokeAuthLambda(userCode: string, verificationUri: string): Promise<void> {
+    const lambdaArn = process.env.AUTH_UTIL_LAMBDA_ARN
+    if (!lambdaArn) {
+        throw new Error('AUTH_UTIL_LAMBDA_ARN environment variable is required for CI authentication')
+    }
+
+    const AWS = require('aws-sdk')
+    const lambda = new AWS.Lambda()
+
+    const request: AuthorizeRequest = {
+        secret: 'GitHubBot/AuthSecret', // Default secret name
+        userCode,
+        verificationUri,
+    }
+
+    await lambda
+        .invoke({
+            FunctionName: lambdaArn,
+            Payload: JSON.stringify(request),
+        })
+        .promise()
+}

packages/amazonq/test/e2e_new/amazonq/utils/setup.ts

@@ -5,12 +5,21 @@
 import { signInToAmazonQ } from './authUtils'
 import { testContext } from './testContext'
 import { closeAllTabs } from './cleanupUtils'
+import { isRunningInGitHubActionsE2E } from './ciUtils'
 
 before(async function () {
     this.timeout(60000)
-    console.log('\n\n*** MANUAL INTERVENTION REQUIRED ***')
-    console.log('When prompted, you must manually click to open the browser and complete authentication')
-    console.log('You have 60 seconds to complete this step\n\n')
+
+    if (isRunningInGitHubActionsE2E()) {
+        console.log('\n\n*** CI AUTHENTICATION MODE ***')
+        console.log('Using Lambda function for automated authentication\n\n')
+        // CI authentication will be handled during the auth flow
+    } else {
+        console.log('\n\n*** MANUAL INTERVENTION REQUIRED ***')
+        console.log('When prompted, you must manually click to open the browser and complete authentication')
+        console.log('You have 60 seconds to complete this step\n\n')
+    }
+
     await signInToAmazonQ()
     const webviewView = testContext.webviewView
     await closeAllTabs(webviewView)

packages/core/src/shared/settings-amazonq.gen.ts

@@ -36,7 +36,8 @@ export const amazonqSettings = {
     "amazonQ.workspaceIndexMaxFileSize": {},
     "amazonQ.workspaceIndexCacheDirPath": {},
     "amazonQ.workspaceIndexIgnoreFilePatterns": {},
-    "amazonQ.ignoredSecurityIssues": {}
+    "amazonQ.ignoredSecurityIssues": {},
+    "amazonQ.proxy.certificateAuthority": {}
 }
 
 export default amazonqSettings