Onboard to pre-release extensions

.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,32 +44,32 @@ 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:
           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:
           name: ${{ matrix.vsce_target }}
-          path: "*.vsix"
+          path: '*.vsix'
       - name: Check latest published version
         shell: bash
         run: |
@@ -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.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+set -eEuo pipefail
+
+SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}")
+ROOT_RELATIVE_DIR=$(dirname "${SCRIPT_RELATIVE_DIR}")
+
+cd $ROOT_RELATIVE_DIR
+
+# 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
+
+# Update versions in package.json
+(cat package.json | jq --arg VER $VER --arg LANGVER $LANGUAGE_SERVER_VERSION '
+.version=$VER |
+.langServer.version=$LANGVER
+') > /tmp/package.json && mv /tmp/package.json package.json

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",

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