From 921e0fbfd2902cc12abd60ce3dbb686ddeb94532 Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Wed, 3 May 2023 11:58:16 +0200 Subject: [PATCH 1/9] Add pre release flag to package & publish --- .github/workflows/preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index e5ae9a3eb..30d4e8ea7 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -64,7 +64,7 @@ jobs: npm_config_arch: ${{ matrix.npm_config_arch }} ls_target: ${{ matrix.ls_target }} - name: Package VSIX - run: npm run package -- --target=${{ matrix.vsce_target }} + run: npm run package -- --pre-release --target=${{ matrix.vsce_target }} - name: Upload vsix as artifact uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # https://github.com/actions/upload-artifact/releases/tag/v3.1.2 with: @@ -84,6 +84,6 @@ jobs: steps: - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # https://github.com/actions/download-artifact/releases/tag/v3.0.2 - name: Publish Preview Extension - run: npx vsce publish --no-git-tag-version --packagePath $(find . -iname *.vsix) + run: npx vsce publish --pre-release --no-git-tag-version --packagePath $(find . -iname *.vsix) env: VSCE_PAT: ${{ secrets.VSCE_PAT }} From 6c6c4f879c21cef180dad931ea3bbe49e19ddfca Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Wed, 3 May 2023 12:18:08 +0200 Subject: [PATCH 2/9] Don't update any other attributes in package.json We only need to set the version for pre-releases now. --- build/preview | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build/preview b/build/preview index 8e88e9e3a..67f2ad638 100755 --- a/build/preview +++ b/build/preview @@ -13,19 +13,10 @@ if [ -z "${LANGUAGE_SERVER_VERSION:-}" ]; then LANGUAGE_SERVER_VERSION="$(jq -r .langServer.version package.json)" fi -# Get existing name & description -DISPLAY_NAME="$(jq -r .displayName package.json) (Preview)" -DESCRIPTION="$(jq -r .description package.json) (Preview)" - # set preview info in package.json -(cat package.json | jq --arg VER $VERSION --arg LANGVER $LANGUAGE_SERVER_VERSION --arg NAME "$DISPLAY_NAME" --arg DESC "$DESCRIPTION" ' +(cat package.json | jq --arg VER $VERSION --arg LANGVER $LANGUAGE_SERVER_VERSION ' .version=$VER | .langServer.version=$LANGVER | -.preview=true | -.name="terraform-preview" | -.icon="assets/icons/terraform_logo_mark_dark_universal.png" | -.displayName=$NAME | -.description=$DESC ') > /tmp/package.json && mv /tmp/package.json package.json # prepend preview info to README.md From 54d86ca34db37e04dd9553d3c3973440282298d0 Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Wed, 3 May 2023 12:19:18 +0200 Subject: [PATCH 3/9] Remove Readme changes for preview releases --- build/nightly.md | 13 ------------- build/preview | 3 --- 2 files changed, 16 deletions(-) delete mode 100644 build/nightly.md diff --git a/build/nightly.md b/build/nightly.md deleted file mode 100644 index 3e5b1ad1b..000000000 --- a/build/nightly.md +++ /dev/null @@ -1,13 +0,0 @@ -# Terraform Preview Visual Studio Code Extension - -> ### **ATTENTION: This is the *preview* version of the [VS Code Terraform extension](https://github.com/golang/vscode-terraform), used for early feedback and testing.** -> It is contains previews of new features and bug fixes that are still under review or test. Therefore, this extension can be broken or unstable at times. If you are looking for the stable version, -please install [the default VS Code Terraform extension](https://marketplace.visualstudio.com/items?itemName=hashicorp.terraform) instead. -> -> **NOTE: The stable Terraform extension (`hashicorp.terraform`) cannot be used at the same time as the Terraform Preview extension (`hashicorp.terraform-preview`)**. If you have installed both extensions, you **must disable or uninstall** one of them. For further guidance, read the [documentation on how to disable an extension](https://code.visualstudio.com/docs/editor/extension-gallery#_disable-an-extension). - -> ### **Differences between Terraform and Terraform Preview** -> -> * Terraform Preview is released more frequently than the stable version. -> * Terraform Preview includes features and bug fixes that are not yet finalized. -> * Terraform Preview may use pre-release versions of tools (such as `terraform-ls`) instead of released versions. diff --git a/build/preview b/build/preview index 67f2ad638..0fbb80c9c 100755 --- a/build/preview +++ b/build/preview @@ -18,6 +18,3 @@ fi .version=$VER | .langServer.version=$LANGVER | ') > /tmp/package.json && mv /tmp/package.json package.json - -# prepend preview info to README.md -sed '/^# Terraform Extension for Visual Studio Code$/d' README.md | cat build/nightly.md - > /tmp/rdme && mv /tmp/rdme README.md From 0acffc6a5a631a3da98c992cac719ea4eb7d58ed Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Wed, 3 May 2023 13:00:57 +0200 Subject: [PATCH 4/9] Update pre-release versioning --- build/preview | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/build/preview b/build/preview index 0fbb80c9c..0526de1ff 100755 --- a/build/preview +++ b/build/preview @@ -7,14 +7,24 @@ ROOT_RELATIVE_DIR=$(dirname "${SCRIPT_RELATIVE_DIR}") cd $ROOT_RELATIVE_DIR -# get current version info -VERSION=`git log -1 --format=%cd --date="format:%Y.%-m.%-d%H"` +# Get current version info +VERSION=$(cat package.json | jq -r '.version') # e.g. 2.26.0 +MAJOR=$(echo $VERSION | cut -d. -f1) +MINOR=$(echo $VERSION | cut -d. -f2) +# Build new version +# +# For the pre-release build, we keep the major and minor versions +# and add the timestamp of the last commit as a patch. +NEW_PATCH=`git log -1 --format=%cd --date="format:%Y%m%d%H"` # e.g. 2023050312 +VER="$MAJOR.$MINOR.$NEW_PATCH" + +# Update the language server version if passed via the workflow if [ -z "${LANGUAGE_SERVER_VERSION:-}" ]; then LANGUAGE_SERVER_VERSION="$(jq -r .langServer.version package.json)" fi -# set preview info in package.json -(cat package.json | jq --arg VER $VERSION --arg LANGVER $LANGUAGE_SERVER_VERSION ' +# Update versions in package.json +(cat package.json | jq --arg VER $VER --arg LANGVER $LANGUAGE_SERVER_VERSION ' .version=$VER | -.langServer.version=$LANGVER | +.langServer.version=$LANGVER ') > /tmp/package.json && mv /tmp/package.json package.json From 2b913a2c9b15c711e80518d62e288225e7759fb8 Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Wed, 3 May 2023 13:12:00 +0200 Subject: [PATCH 5/9] Remove check if both extensions are installed The new pre-releases extensions function only allows one extension to be installed at a time. --- src/extension.ts | 7 +------ src/settings.ts | 21 --------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index f1cbf8049..6f1adfa53 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -28,7 +28,7 @@ import { ShowReferencesFeature } from './features/showReferences'; import { CustomSemanticTokens } from './features/semanticTokens'; import { ModuleProvidersFeature } from './features/moduleProviders'; import { ModuleCallsFeature } from './features/moduleCalls'; -import { getInitializationOptions, migrateLegacySettings, previewExtensionPresent } from './settings'; +import { getInitializationOptions, migrateLegacySettings } from './settings'; import { TerraformLSCommands } from './commands/terraformls'; import { TerraformCommands } from './commands/terraform'; import { TerraformVersionFeature } from './features/terraformVersion'; @@ -51,11 +51,6 @@ export async function activate(context: vscode.ExtensionContext): Promise reporter = new TelemetryReporter(context.extension.id, manifest.version, manifest.appInsightsKey); context.subscriptions.push(reporter); - if (previewExtensionPresent(context.extension.id)) { - reporter.sendTelemetryEvent('previewExtensionPresentWithStable'); - return undefined; - } - await migrateLegacySettings(context); // always register commands needed to control terraform-ls diff --git a/src/settings.ts b/src/settings.ts index 42d90f842..853e95a02 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -157,24 +157,3 @@ export async function migrateLegacySettings(ctx: vscode.ExtensionContext) { await deleteSetting('terraform-ls', 'experimentalFeatures'); await vscode.commands.executeCommand('workbench.action.reloadWindow'); } - -export function previewExtensionPresent(currentExtensionID: string) { - const stable = vscode.extensions.getExtension('hashicorp.terraform'); - const preview = vscode.extensions.getExtension('hashicorp.terraform-preview'); - - const msg = 'Please ensure only one is enabled or installed and reload this window'; - - if (currentExtensionID === 'hashicorp.terraform-preview') { - if (stable !== undefined) { - vscode.window.showErrorMessage('Terraform Preview cannot be used while Terraform Stable is also enabled.' + msg); - return true; - } - } else if (currentExtensionID === 'hashicorp.terraform') { - if (preview !== undefined) { - vscode.window.showErrorMessage('Terraform Stable cannot be used while Terraform Preview is also enabled.' + msg); - return true; - } - } - - return false; -} From 731509dc614a7dc7be142e987e6fd50a3a912e42 Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Thu, 4 May 2023 13:10:17 +0200 Subject: [PATCH 6/9] Add file extension to preview script --- .github/workflows/preview.yml | 10 +++++----- build/{preview => preview.sh} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename build/{preview => preview.sh} (100%) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 30d4e8ea7..1b44a874f 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: inputs: langserver: - description: "The terraform-ls version to use. If not specified will use version in package.json" + description: 'The terraform-ls version to use. If not specified will use version in package.json' required: false type: string @@ -44,20 +44,20 @@ jobs: - vsce_target: darwin-arm64 ls_target: darwin_arm64 npm_config_arch: arm64 - runs-on: "ubuntu-latest" + runs-on: 'ubuntu-latest' steps: - name: Check out repository uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # https://github.com/actions/checkout/releases/tag/v3.5.2 - name: Set preview in package.json id: set-preview run: | - ./build/preview + ./build/preview.sh env: LANGUAGE_SERVER_VERSION: ${{ github.event.inputs.langserver }} - name: Setup Node uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # https://github.com/actions/setup-node/releases/tag/v3.6.0 with: - node-version-file: ".nvmrc" + node-version-file: '.nvmrc' - name: Install dependencies run: npm ci env: @@ -69,7 +69,7 @@ jobs: uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # https://github.com/actions/upload-artifact/releases/tag/v3.1.2 with: name: ${{ matrix.vsce_target }} - path: "*.vsix" + path: '*.vsix' - name: Check latest published version shell: bash run: | diff --git a/build/preview b/build/preview.sh similarity index 100% rename from build/preview rename to build/preview.sh From 168a40aed24cc57c51911b5da64d7d3e4fac9f4e Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Thu, 4 May 2023 13:11:53 +0200 Subject: [PATCH 7/9] Remove preview extension icon --- .../terraform_logo_mark_dark_universal.png | Bin 29556 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 assets/icons/terraform_logo_mark_dark_universal.png diff --git a/assets/icons/terraform_logo_mark_dark_universal.png b/assets/icons/terraform_logo_mark_dark_universal.png deleted file mode 100644 index 812d70ca5172530dc7800b8c0605090f5c2aa557..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29556 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

kAh&ieO`%{N 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 From faad9a8abd6bf32358486929a24c9913f856e153 Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Thu, 4 May 2023 13:12:32 +0200 Subject: [PATCH 8/9] Remove outdated preview script reference --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 3b1ee1b55..747ecf365 100644 --- a/package.json +++ b/package.json @@ -669,8 +669,7 @@ "lint": "eslint src --ext ts", "prettier": "prettier \"**/*.+(js|json|ts)\"", "format": "npm run prettier -- --write", - "check-format": "npm run prettier -- --check", - "preview": "ts-node ./build/preview.ts" + "check-format": "npm run prettier -- --check" }, "dependencies": { "@vscode/extension-telemetry": "^0.4.9", From 921e4857b78c1cba2b7807ea0aef9ba78a169fb8 Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Thu, 4 May 2023 13:20:09 +0200 Subject: [PATCH 9/9] Add copyright headers to preview script --- build/preview.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/preview.sh b/build/preview.sh index 0526de1ff..8f9ef55c0 100755 --- a/build/preview.sh +++ b/build/preview.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 set -eEuo pipefail