Merge branch 'feature/standalone' into feature/cw-proactive-scan

Author: ctlai95

.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

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,18 +17,19 @@ 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"

buildspec/release/20buildrelease.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:
             nodejs: 16
@@ -19,12 +20,23 @@ phases:
             - apt-get install -y libasound2-plugins
     build:
         commands:
+            - echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
             # --unsafe-perm is needed because we run as root
             - npm ci --unsafe-perm
-            - npm run package
+            - |
+                if [ $TARGET_EXTENSION = "toolkit" ]; then
+                  cp ./README.quickstart.vscode.md ./README.md
+                fi
+            - npm run package -w packages/${TARGET_EXTENSION}
+            - cp packages/${TARGET_EXTENSION}/package.json ./package.json
+            - NUM_VSIX=$(ls -1q *.vsix | wc -l)
+            - |
+                if [ "$NUM_VSIX" != "1" ]; then
+                  echo "Number of .vsix to release is not exactly 1, it is: ${NUM_VSIX}"
+                  exit 1
+                fi
 
 artifacts:
     files:
-        - aws-toolkit-vscode*
-        - packages/toolkit/package.json
-    discard-paths: true
+        - '*.vsix'
+        - package.json

buildspec/release/40pushtogithub.yml

@@ -14,21 +14,24 @@ phases:
             # Check for implicit env vars passed from the release pipeline.
             - test -n "${TOOLKITS_GITHUB_REPO_OWNER}"
             - test -n "${GITHUB_TOKEN}"
+            - test -n "${TARGET_EXTENSION}"
+            - test -n "${TARGET_BRANCH}"
             - REPO_URL="https://[email protected]/${TOOLKITS_GITHUB_REPO_OWNER}/aws-toolkit-vscode.git"
 
     build:
         commands:
             - |
+                echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
                 git config --global user.name "aws-toolkit-automation"
                 git config --global user.email "<>"
                 git remote add originWithCreds "$REPO_URL"
                 echo "Adding SNAPSHOT to next version string"
                 # Increase minor version
-                npm version --no-git-tag-version minor -w packages/toolkit
-                VERSION=$(node -e "console.log(require('./packages/toolkit/package.json').version);")
+                npm version --no-git-tag-version minor -w packages/${TARGET_EXTENSION}
+                VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
                 # Append -SNAPSHOT
-                npm version --no-git-tag-version "${VERSION}-SNAPSHOT" -w packages/toolkit
-                git add packages/toolkit/package.json
+                npm version --no-git-tag-version "${VERSION}-SNAPSHOT" -w packages/${TARGET_EXTENSION}
+                git add packages/${TARGET_EXTENSION}/package.json
                 git add package-lock.json
                 git commit -m "Update version to snapshot version: ${VERSION}-SNAPSHOT"
             - |
@@ -38,4 +41,4 @@ phases:
                 fi
                 echo "pushing to github"
                 git push originWithCreds --tags
-                git push originWithCreds master
+                git push originWithCreds ${TARGET_BRANCH}

buildspec/release/50githubrelease.yml

@@ -19,22 +19,24 @@ phases:
         commands:
             # Check for implicit env vars passed from the release pipeline.
             - test -n "${TOOLKITS_GITHUB_REPO_OWNER}"
+            - test -n "${TARGET_EXTENSION}"
             - REPO="${TOOLKITS_GITHUB_REPO_OWNER}/aws-toolkit-vscode"
 
     build:
         commands:
+            - echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
             # pull in the build artifacts
             - cp -r ${CODEBUILD_SRC_DIR_buildPipeline}/* .
-            - VERSION=$(node -e "console.log(require('./packages/toolkit/package.json').version);")
-            - UPLOAD_TARGET=$(ls aws-toolkit-vscode*.vsix)
+            - VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
+            - UPLOAD_TARGET=$(ls *.vsix)
             - HASH_UPLOAD_TARGET=${UPLOAD_TARGET}.sha384
             - 'HASH=$(sha384sum -b $UPLOAD_TARGET | cut -d" " -f1)'
             - echo "Writing hash to $HASH_UPLOAD_TARGET"
             - echo $HASH > $HASH_UPLOAD_TARGET
             - echo "posting $VERSION with sha384 hash $HASH to GitHub"
             - RELEASE_MESSAGE="AWS Toolkit for VS Code $VERSION"
             - |
-                if [ $STAGE = "prod" ]; then
+                if [ "$STAGE" = "prod" ] && [ "$TARGET_EXTENSION" = "toolkit" ]; then
                   gh release create --repo $REPO --title "$VERSION" --notes "$RELEASE_MESSAGE" -- "v$VERSION" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
                 else
                   echo "SKIPPED: 'gh release create --repo $REPO'"