Onboard to pre-release extensions

.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 }}

build/preview

@@ -7,26 +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
 
-# 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" '
+# Update versions in package.json
+(cat package.json | jq --arg VER $VER --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
+.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

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<void>
   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

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;
-}