feedback

src/api/terraformCloud/organization.ts

@@ -9,7 +9,7 @@ import { paginationMeta, paginationParams } from './pagination';
 import { searchQueryParams } from './filter';
 import { errors } from './errors';
 
-export const organization = z.object({
+const organization = z.object({
   id: z.string(),
   attributes: z.object({
     'external-id': z.string(),

src/providers/tfc/applyProvider.ts

@@ -9,13 +9,13 @@ import { Writable } from 'stream';
 import axios from 'axios';
 import TelemetryReporter from '@vscode/extension-telemetry';
 
+import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 import { ZodiosError } from '@zodios/core';
 import { handleAuthError, handleZodiosError } from './uiHelpers';
 import { GetChangeActionIcon } from './helpers';
 import { AppliedChange, ChangeSummary, Diagnostic, LogLine, Outputs } from '../../api/terraformCloud/log';
 import { ApplyTreeItem } from './runProvider';
 import { OutputsItem, DiagnosticsItem, DiagnosticSummary, ItemWithChildren, isItemWithChildren } from './logHelpers';
-import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 
 export class ApplyTreeDataProvider implements vscode.TreeDataProvider<vscode.TreeItem>, vscode.Disposable {
   private readonly didChangeTreeData = new vscode.EventEmitter<vscode.TreeItem | undefined>();

src/providers/tfc/planProvider.ts

@@ -9,14 +9,13 @@ import { Writable } from 'stream';
 import axios from 'axios';
 import TelemetryReporter from '@vscode/extension-telemetry';
 
-// import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
+import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 import { ZodiosError } from '@zodios/core';
 import { handleAuthError, handleZodiosError } from './uiHelpers';
 import { GetChangeActionIcon, GetDriftChangeActionMessage } from './helpers';
 import { Change, ChangeSummary, Diagnostic, DriftSummary, LogLine, Outputs } from '../../api/terraformCloud/log';
 import { PlanTreeItem } from './runProvider';
 import { DiagnosticSummary, DiagnosticsItem, OutputsItem, isItemWithChildren, ItemWithChildren } from './logHelpers';
-import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 
 export class PlanTreeDataProvider implements vscode.TreeDataProvider<vscode.TreeItem>, vscode.Disposable {
   private readonly didChangeTreeData = new vscode.EventEmitter<vscode.TreeItem | undefined>();

src/providers/tfc/runProvider.ts

@@ -9,6 +9,7 @@ import TelemetryReporter from '@vscode/extension-telemetry';
 import semver from 'semver';
 
 import { TerraformCloudWebUrl, apiClient } from '../../api/terraformCloud';
+import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 import { RUN_SOURCE, RunAttributes, TRIGGER_REASON } from '../../api/terraformCloud/run';
 import { WorkspaceTreeItem } from './workspaceProvider';
 import { GetPlanApplyStatusIcon, GetRunStatusIcon, GetRunStatusMessage, RelativeTimeFormat } from './helpers';
@@ -20,7 +21,6 @@ import { ApplyAttributes } from '../../api/terraformCloud/apply';
 import { CONFIGURATION_SOURCE } from '../../api/terraformCloud/configurationVersion';
 import { PlanTreeDataProvider } from './planProvider';
 import { ApplyTreeDataProvider } from './applyProvider';
-import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 
 export class RunTreeDataProvider implements vscode.TreeDataProvider<TFCRunTreeItem>, vscode.Disposable {
   private readonly didChangeTreeData = new vscode.EventEmitter<undefined | TFCRunTreeItem>();

src/providers/tfc/workspaceProvider.ts

@@ -8,6 +8,7 @@ import TelemetryReporter from '@vscode/extension-telemetry';
 
 import { RunTreeDataProvider } from './runProvider';
 import { apiClient, TerraformCloudWebUrl } from '../../api/terraformCloud';
+import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 import { ProjectsAPIResource, ResetProjectItem } from './workspaceFilters';
 import { GetRunStatusIcon, GetRunStatusMessage, RelativeTimeFormat } from './helpers';
 import { WorkspaceAttributes } from '../../api/terraformCloud/workspace';
@@ -16,7 +17,6 @@ import { APIQuickPick, handleAuthError, handleZodiosError } from './uiHelpers';
 import { isErrorFromAlias, ZodiosError } from '@zodios/core';
 import axios from 'axios';
 import { apiErrorsToString } from '../../api/terraformCloud/errors';
-import { TerraformCloudAuthenticationProvider } from './authenticationProvider';
 
 export class WorkspaceTreeDataProvider implements vscode.TreeDataProvider<vscode.TreeItem>, vscode.Disposable {
   private readonly didChangeTreeData = new vscode.EventEmitter<undefined | vscode.TreeItem>();

src/test/e2e/specs/extension.e2e.ts

@@ -9,9 +9,9 @@ import {
   ExtensionsViewItem,
   ExtensionsViewSection,
   BottomBarPanel,
-  OutputView,
 } from 'vscode-extension-tester';
-import { expect, assert } from 'chai';
+import { expect } from 'chai';
+import pjson from '../../../../package.json';
 
 describe('VS Code Extension Testing', () => {
   let terraformExtension: ExtensionsViewItem;
@@ -48,8 +48,8 @@ describe('VS Code Extension Testing', () => {
     const version = await terraformExtension.getVersion();
 
     // in this case we are comparing the results against the values in package.json
-    expect(author).equals('hashicorp');
-    expect(version).equals('2.34.2024101517');
+    expect(author).equals(pjson.publisher);
+    expect(version).equals(pjson.version);
   });
 
   it('should be able to load VSCode', async () => {

tsconfig.json

@@ -8,7 +8,9 @@
     "sourceMap": true,
     "strict": true,
     "skipLibCheck": true,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+
+    "resolveJsonModule": true
   },
   "include": ["src"],
   "exclude": ["node_modules", ".vscode-test", ".vscode-test-web", ".test-storage", ".test-extensions"]