do the thing

.changes/unreleased/INTERNAL-20241105-111825.yaml

@@ -0,0 +1,6 @@
+kind: INTERNAL
+body: Migrate to redhat-ext-tester
+time: 2024-11-05T11:18:25.988501-05:00
+custom:
+    Issue: "1873"
+    Repository: vscode-terraform

.github/workflows/test.yml

@@ -50,6 +50,8 @@ jobs:
           - ubuntu-latest
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
+    env:
+      VSCODE_VERSION: ${{ matrix.vscode }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -72,3 +74,9 @@ jobs:
       - name: Run Tests
         run: npm test
         if: runner.os != 'Linux'
+      - name: Run UI Tests
+        run: xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npm run test:ui
+        if: runner.os == 'Linux'
+      - name: Run UI Tests
+        run: npm run test:ui
+        if: runner.os != 'Linux'

.gitignore

@@ -2,6 +2,7 @@
 .terraform
 .vscode-test
 .vscode-test-web
+.test-storage
 .test-extensions
 *.vsix
 bin

.prettierignore

@@ -2,6 +2,7 @@
 .vscode-test
 .vscode-test-web
 .wdio-vscode-service
+.test-storage
 language-configuration.json
 node_modules
 dist

.vscode/launch.json

@@ -25,6 +25,32 @@
       "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionDevelopmentKind=web"],
       "outFiles": ["${workspaceFolder}/dist/web/**/*.js"],
       "preLaunchTask": "npm: watch"
+    },
+    {
+      "name": "Debug UI Tests",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/node_modules/.bin/extest",
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/vscode-extension-tester/out/cli.js"
+      },
+      "args": [
+        "setup-and-run",
+        "${workspaceFolder}/out/test/e2e/specs/**/*.e2e.js",
+        "--code_settings",
+        "${workspaceFolder}/src/test/e2e/settings.json",
+        "--extensions_dir",
+        ".test-extensions",
+        "--mocha_config",
+        "${workspaceFolder}/src/test/e2e/.mocharc.js",
+        "--uninstall_extension",
+        "--log_level",
+        "debug",
+        "--storage",
+        ".test-storage"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
     }
   ]
 }

.vscodeignore

@@ -1,3 +1,7 @@
+.mocharc.js
+esbuild.mjs
+eslint.config.mjs
+uitest.mjs
 .changes
 .changie.yaml
 .copywrite.hcl
@@ -16,6 +20,7 @@
 .vscode-test.mjs
 .vscodeignore
 .wdio-vscode-service
+.test-storage
 **/__mocks__
 build/
 DEVELOPMENT.md
@@ -26,3 +31,4 @@ src/
 out/
 esbuild.js
 tsconfig.json
+.test-extensions

eslint.config.mjs

@@ -37,9 +37,10 @@ export default [
       semi: 'warn',
       '@typescript-eslint/no-explicit-any': ['warn', { ignoreRestArgs: true }],
       '@typescript-eslint/naming-convention': 'off',
-      '@typescript-eslint/no-unsafe-assignment': 'warn',
-      '@typescript-eslint/no-unsafe-argument': 'warn',
-      '@typescript-eslint/no-unsafe-member-access': 'warn',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-argument': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
       '@typescript-eslint/restrict-template-expressions': [
         'error',
         {
@@ -64,6 +65,7 @@ export default [
     ignores: [
       '.vscode-test',
       '.wdio-vscode-service',
+      '.test-storage',
       'dist',
       'out',
       'src/test',

package.json

@@ -550,6 +550,11 @@
         "title": "HCP Terraform: Login",
         "enablement": "terraform.cloud.signed-in === false"
       },
+      {
+        "command": "terraform.cloud.logout",
+        "title": "HCP Terraform: Logout",
+        "enablement": "terraform.cloud.signed-in === true"
+      },
       {
         "command": "terraform.cloud.workspaces.refresh",
         "title": "Refresh",
@@ -656,6 +661,10 @@
           "command": "terraform.cloud.login",
           "when": "terraform.cloud.signed-in === false && terraform.cloud.views.visible"
         },
+        {
+          "command": "terraform.cloud.logout",
+          "when": "terraform.cloud.signed-in === true && terraform.cloud.views.visible"
+        },
         {
           "command": "terraform.cloud.organization.picker",
           "when": "terraform.cloud.signed-in"
@@ -928,7 +937,7 @@
     ]
   },
   "scripts": {
-    "prepare": "npm run download:artifacts && cd src/test/e2e && npm install",
+    "prepare": "npm run download:artifacts",
     "compile": "npm run check-types && npm run lint && node esbuild.mjs",
     "compile:prod": "npm run check-types && npm run lint && node esbuild.mjs --production",
     "compile:tests": "tsc -p .",
@@ -947,7 +956,7 @@
     "package": "vsce package",
     "pretest": "npm run compile:tests && npm run compile && npm run lint",
     "test": "vscode-test",
-    "test:ui": "npm run compile:tests && extest setup-and-run './out/test/e2e/specs/**/*.e2e.js' --code_version max --extensions_dir .test-extensions",
+    "test:ui": "node uitest.mjs",
     "lint": "eslint",
     "format": "prettier --write .",
     "check-types": "tsc --noEmit",
@@ -963,7 +972,8 @@
     "vscode-languageclient": "^9.0.1",
     "vscode-uri": "^3.0.7",
     "which": "^3.0.1",
-    "zod": "^3.21.4"
+    "zod": "^3.21.4",
+    "zod-fixture": "^2.5.2"
   },
   "devDependencies": {
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",

src/api/terraformCloud/account.ts

@@ -7,7 +7,7 @@ import { makeApi } from '@zodios/core';
 import { z } from 'zod';
 import { errors } from './errors';
 
-const accountDetails = z.object({
+export const accountDetails = z.object({
   data: z.object({
     id: z.string(),
     type: z.string(),
@@ -18,6 +18,8 @@ const accountDetails = z.object({
   }),
 });
 
+export type Account = z.infer<typeof accountDetails>;
+
 export const accountEndpoints = makeApi([
   {
     method: 'get',

src/api/terraformCloud/organization.ts

@@ -9,7 +9,7 @@ import { paginationMeta, paginationParams } from './pagination';
 import { searchQueryParams } from './filter';
 import { errors } from './errors';
 
-const organization = z.object({
+export const organization = z.object({
   id: z.string(),
   attributes: z.object({
     'external-id': z.string(),
@@ -19,7 +19,7 @@ const organization = z.object({
 
 export type Organization = z.infer<typeof organization>;
 
-const organizations = z.object({
+export const organizations = z.object({
   data: z.array(organization),
   meta: z
     .object({
@@ -41,7 +41,8 @@ const organizationMemebrship = z.object({
     }),
   }),
 });
-const organizationMemberships = z.object({
+
+export const organizationMemberships = z.object({
   data: z.array(organizationMemebrship),
 });
 export type OrganizationMembership = z.infer<typeof organizationMemebrship>;

src/api/terraformCloud/project.ts

@@ -9,7 +9,7 @@ import { paginationMeta, paginationParams } from './pagination';
 import { searchQueryParams } from './filter';
 import { errors } from './errors';
 
-const project = z.object({
+export const project = z.object({
   id: z.string(),
   attributes: z.object({
     name: z.string(),
@@ -18,7 +18,7 @@ const project = z.object({
 
 export type Project = z.infer<typeof project>;
 
-const projects = z.object({
+export const projects = z.object({
   data: z.array(project),
   meta: z.object({
     pagination: paginationMeta,

src/api/terraformCloud/workspace.ts

@@ -53,7 +53,7 @@ const workspaceRelationships = z.object({
   project: relationship,
 });
 
-const workspace = z.object({
+export const workspace = z.object({
   id: z.string(),
   attributes: workspaceAttributes,
   relationships: workspaceRelationships,
@@ -66,7 +66,7 @@ const workspace = z.object({
 export type Workspace = z.infer<typeof workspace>;
 export type WorkspaceAttributes = z.infer<typeof workspaceAttributes>;
 
-const workspaces = z.object({
+export const workspaces = z.object({
   data: z.array(workspace),
   meta: z.object({
     pagination: paginationMeta,

src/commands/generateBugReport.ts

@@ -154,11 +154,9 @@ Outdated:\t${info.outdated}
     const extensions = vscode.extensions.all
       .filter((element) => element.packageJSON.isBuiltin === false)
       .sort((leftside, rightside): number => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         if (leftside.packageJSON.name.toLowerCase() < rightside.packageJSON.name.toLowerCase()) {
           return -1;
         }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         if (leftside.packageJSON.name.toLowerCase() > rightside.packageJSON.name.toLowerCase()) {
           return 1;
         }

src/extension.ts

@@ -35,6 +35,7 @@ import { TerraformLSCommands } from './commands/terraformls';
 import { TerraformCommands } from './commands/terraform';
 import * as lsStatus from './status/language';
 import { TerraformCloudFeature } from './features/terraformCloud';
+import { setupMockServer, stopMockServer } from './test/e2e/specs/mocks/server';
 
 const id = 'terraform';
 const brand = `HashiCorp Terraform`;
@@ -55,6 +56,11 @@ let initializationError: ResponseError<InitializeError> | Error | undefined = un
 let crashCount = 0;
 
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
+  // if (config('terraform').get<string>('trace.server') === 'verbose') {
+  //   setupMockServer();
+  // }
+  setupMockServer();
+
   const manifest = context.extension.packageJSON;
   reporter = new TelemetryReporter(context.extension.id, manifest.version, manifest.appInsightsKey);
   context.subscriptions.push(reporter);
@@ -240,4 +246,9 @@ export async function deactivate(): Promise<void> {
       lsStatus.setLanguageServerState(error, false, vscode.LanguageStatusSeverity.Error);
     }
   }
+
+  // if (config('terraform').get<string>('trace.server') === 'verbose') {
+  //   stopMockServer();
+  // }
+  stopMockServer();
 }