Merge master into feature/amazonq

Author: aws-toolkit-automation

.changes/next-release/Feature-49ee5487-6aef-4d4b-9464-ac84b97f69e7.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q Code Transformation: add details about expected changes in transformation plan"
+}

.eslintignore

@@ -11,9 +11,11 @@ src/shared/telemetry/clienttelemetry.d.ts
 src/codewhisperer/client/codewhispererclient.d.ts
 src/codewhisperer/client/codewhispereruserclient.d.ts
 src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+src/auth/sso/oidcclientpkce.d.ts
 src/testFixtures/**
 packages/core/src/shared/telemetry/clienttelemetry.d.ts
 packages/core/src/codewhisperer/client/codewhispererclient.d.ts
 packages/core/src/codewhisperer/client/codewhispereruserclient.d.ts
 packages/core/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+packages/core/src/auth/sso/oidcclientpkce.d.ts
 packages/core/src/testFixtures/**

.github/workflows/release.yml

@@ -49,10 +49,11 @@ jobs:
                   echo "FEAT_NAME=" >> $GITHUB_ENV
                   echo "TAG_NAME=prerelease" >> $GITHUB_ENV
             - run: npm ci
-            - name: vsix # TODO: For packages/toolkit release only
+            - name: vsix
               run: |
-                  npm run createRelease  # Generate CHANGELOG.md
+                  npm run createRelease -w packages/toolkit -w packages/amazonq  # Generate CHANGELOG.md
                   npm run -w packages/toolkit package -- --feature "$FEAT_NAME"
+                  npm run -w packages/amazonq package -- --feature "$FEAT_NAME"
             - uses: actions/upload-artifact@v4
               with:
                   name: artifacts
@@ -61,11 +62,18 @@ jobs:
             - name: Export outputs
               id: build
               run: |
+                  write_package_info() {
+                      PKG_NAME=$1
+                      PKG_DISPLAY_NAME=$(grep -m 1 displayName packages/${PKG_NAME}/package.json | grep -o '[a-zA-z][^\"]\+' | tail -n1)
+                      echo "version=$(grep -m 1 version packages/${PKG_NAME}/package.json | grep -o '[0-9][^\"]\+' | sed 's/-SNAPSHOT//')" >> $GITHUB_OUTPUT
+                      echo "${PKG_NAME}_changes<<EOF" >> $GITHUB_OUTPUT
+                      # Add extension display name to the topmost changelog section.
+                      cat packages/${PKG_NAME}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 2' | sed -e "1 s/## /## ${PKG_DISPLAY_NAME} - /" >> $GITHUB_OUTPUT
+                  }
                   echo "feature=$FEAT_NAME" >> $GITHUB_OUTPUT
                   echo "tagname=$TAG_NAME" >> $GITHUB_OUTPUT
-                  echo "version=$(grep -m 1 version packages/toolkit/package.json | grep -o '[0-9][^\"]\+' | sed 's/-SNAPSHOT//')" >> $GITHUB_OUTPUT
-                  echo 'changes<<EOF' >> $GITHUB_OUTPUT
-                  cat CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 2' >> $GITHUB_OUTPUT
+                  write_package_info toolkit
+                  write_package_info amazonq
                   echo 'EOF' >> $GITHUB_OUTPUT
 
     publish:
@@ -82,7 +90,8 @@ jobs:
             # Used in release_notes.md
             BRANCH: ${{ github.ref_name }}
             # Used in release_notes.md
-            AWS_TOOLKIT_CHANGES: ${{ needs.package.outputs.changes }}
+            AWS_TOOLKIT_CHANGES: ${{ needs.package.outputs.toolkit_changes }}
+            AMAZON_Q_CHANGES: ${{ needs.package.outputs.amazonq_changes }}
         permissions:
             contents: write
         steps:

.github/workflows/release_notes.md

@@ -9,6 +9,9 @@ _This is an **unsupported preview build** of the `${BRANCH}` branch of AWS Toolk
 
 ${AWS_TOOLKIT_CHANGES}
 
+${AMAZON_Q_CHANGES}
+
 ## Previous changes
 
--   See [CHANGELOG.md](CHANGELOG.md)
+-   For Toolkit, see [CHANGELOG.md](/packages/toolkit/CHANGELOG.md)
+-   For Amazon Q, see [CHANGELOG.md](/packages/amazonq/CHANGELOG.md)

.gitignore

@@ -38,11 +38,11 @@ packages/core/src/testFixtures/**/bin
 packages/core/src/testFixtures/**/obj
 
 # Generated by copyFiles.ts
-packages/*/CHANGELOG.md
 packages/*/LICENSE
 packages/*/NOTICE
 packages/toolkit/package.nls.json
 packages/toolkit/resources
+packages/amazonq/package.nls.json
 packages/amazonq/resources
 
 # Icons

CONTRIBUTING.md

@@ -315,9 +315,14 @@ The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Witho
 
 ### Logging
 
--   Use the `aws.dev.logfile` setting to set the logfile path to a fixed location, so you can easily
-    follow and filter the logfile using shell tools like `tail` and `grep`. For example in
-    settings.json,
+-   Use `getLogger()` to log debugging messages, warnings, etc.
+    -   Example: `getLogger().error('topic: widget failed: %O', { foo: 'bar', baz: 42 })`
+-   Log messages are written to the extension Output channel, which you can view in vscode by visiting the "Output" panel and selecting `AWS Toolkit Logs` or `Amazon Q Logs`.
+-   While viewing the Output channel (`AWS Toolkit Logs` or `Amazon Q Logs`) in vscode:
+    -   Click the "gear" icon to [select a log level](https://github.com/aws/aws-toolkit-vscode/pull/4859) ("Debug", "Info", "Error", …).
+    -   Click the "..." icon to open the log file.
+-   Use the `aws.dev.logfile` setting to set the logfile path to a fixed location, so you can follow
+    and filter logs using shell tools like `tail` and `grep`. For example in settings.json,
     ```
     "aws.dev.logfile": "~/awstoolkit.log",
     ```
@@ -328,7 +333,6 @@ The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Witho
 -   Use the `AWS (Developer): Watch Logs` command to watch and filter Toolkit logs (including
     telemetry) in VSCode.
     -   Only available if you enabled "dev mode" (`aws.dev.forceDevMode` setting, see above).
-    -   Sets `aws.logLevel` to "debug".
     -   Enter text in the Debug Console filter box to show only log messages with that text. <br/>
         <img src="./docs/images/debug-console-filter.png" alt="VSCode Debug Console" width="320"/>
 

README.md

@@ -7,7 +7,7 @@ AWS Toolkit is a [VS Code extension](https://marketplace.visualstudio.com/itemde
 -   Connect with [IAM credentials](https://docs.aws.amazon.com/sdkref/latest/guide/access-users.html),
     [IAM Identity Center (SSO)](https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html),
     or [AWS Builder ID](https://docs.aws.amazon.com/signin/latest/userguide/differences-aws_builder_id.html)
--   Use [CodeWhisperer](https://aws.amazon.com/codewhisperer/) to write code
+-   Use [Amazon Q](https://aws.amazon.com/q/developer/) to write code
 -   Connect to your [CodeCatalyst](https://codecatalyst.aws/) Dev Environments
 -   Debug your Lambda functions using [SAM CLI](https://github.com/aws/aws-sam-cli)
 -   Check and autocomplete code in SAM/CFN (CloudFormation) `template.yaml` files

buildspec/packageTestVsix.yml

@@ -26,10 +26,9 @@ phases:
         commands:
             - export HOME=/home/codebuild-user
             # Generate CHANGELOG.md
-            - npm run createRelease
-            - npm run package
+            - npm run createRelease -w packages/toolkit -w packages/amazonq
+            - npm run package -w packages/toolkit -w packages/amazonq
 
 artifacts:
     files:
-        - aws-toolkit-vscode*vsix
-    discard-paths: true
+        - '*.vsix'

buildspec/release/00clonerepo.yml

@@ -13,12 +13,13 @@ phases:
         commands:
             # Check for implicit env vars passed from the release pipeline.
             - test -n "${TOOLKITS_GITHUB_REPO_OWNER}"
+            - test -n "${TARGET_BRANCH}"
 
     build:
         commands:
             - git clone https://github.com/${TOOLKITS_GITHUB_REPO_OWNER}/aws-toolkit-vscode.git aws-toolkit-vscode
-            # checkout master as we want to commit to it later
-            - cd aws-toolkit-vscode && git checkout master
+            # checkout the target branch as we want to commit to it later to update versions
+            - cd aws-toolkit-vscode && git checkout ${TARGET_BRANCH}
 
 artifacts:
     base-directory: aws-toolkit-vscode

buildspec/release/10changeversion.yml

@@ -8,6 +8,7 @@ phases:
     pre_build:
         commands:
             - aws codeartifact login --tool npm --domain "$TOOLKITS_CODEARTIFACT_DOMAIN" --domain-owner "$TOOLKITS_ACCOUNT_ID" --repository "$TOOLKITS_CODEARTIFACT_REPO"
+            - test -n "${TARGET_EXTENSION}"
 
     install:
         runtime-versions:
@@ -16,22 +17,24 @@ phases:
     build:
         commands:
             - |
+                echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
                 echo "Removing SNAPSHOT from version string"
                 git config --global user.name "aws-toolkit-automation"
                 git config --global user.email "<>"
-                VERSION=$(node -e "console.log(require('./packages/toolkit/package.json').version);" | (IFS="-"; read -r version unused && echo "$version"))
+                VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);" | (IFS="-"; read -r version unused && echo "$version"))
                 DATE=$(date)
-                npm version --no-git-tag-version "$VERSION" -w packages/toolkit
+                npm version --no-git-tag-version "$VERSION" -w packages/${TARGET_EXTENSION}
                 # Call npm ci because 'createRelease' uses ts-node
                 npm ci
             - |
-                npm run createRelease
+                npm run createRelease -w packages/${TARGET_EXTENSION}
             - |
-                git add packages/toolkit/package.json
+                git add packages/${TARGET_EXTENSION}/package.json
                 git add package-lock.json
                 git commit -m "Release $VERSION"
                 echo "tagging commit"
-                git tag -a "v$VERSION" -m "version $VERSION $DATE"
+                # e.g. amazonq/v1.0.0
+                git tag -a "${TARGET_EXTENSION}/v${VERSION}" -m "${TARGET_EXTENSION} version $VERSION $DATE"
                 # cleanup
                 git clean -fxd
                 git reset HEAD --hard