Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solution to cli issue - TypeError: Cannot read properties of undefined (reading 'fsPath') #895 #924

Merged
merged 7 commits into from
Nov 21, 2024
Merged

solution to cli issue - TypeError: Cannot read properties of undefined (reading 'fsPath') #895 #924

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
925a1eb
solution to cli issue TypeError: Cannot read properties of undefined …
gauravsaini04 Oct 28, 2024
44279cd
Merge branch 'devcontainers:main' into cli_issue_#895_solution
gauravsaini04 Oct 30, 2024
d909b97
readDevContainerConfigFile - implemented logic like in other commands…
gauravsaini04 Oct 30, 2024
cde4336
Update lockfile.ts
gauravsaini04 Oct 30, 2024
0203a97
changes as suggested in review comments
gauravsaini04 Oct 31, 2024
56b4ce5
Merge branch 'main' into cli_issue_#895_solution
gauravsaini04 Nov 1, 2024
5e4041f
Merge branch 'main' into cli_issue_#895_solution
gauravsaini04 Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions src/spec-node/featuresCLI/resolveDependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
import * as path from 'path';
import * as jsonc from 'jsonc-parser';
import { Argv } from 'yargs';
import { LogLevel, mapLogLevel } from '../../spec-utils/log';
import { getPackageConfig } from '../../spec-utils/product';
import { createLog } from '../devContainers';
import { UnpackArgv } from '../devContainersSpecCLI';
import { isLocalFile, readLocalFile } from '../../spec-utils/pfs';
import { DevContainerConfig, DevContainerFeature } from '../../spec-configuration/configuration';
import { isLocalFile } from '../../spec-utils/pfs';
import { DevContainerFeature } from '../../spec-configuration/configuration';
import { buildDependencyGraph, computeDependsOnInstallationOrder, generateMermaidDiagram } from '../../spec-configuration/containerFeaturesOrder';
import { OCISourceInformation, processFeatureIdentifier, userFeaturesToArray } from '../../spec-configuration/containerFeaturesConfiguration';
import { readLockfile } from '../../spec-configuration/lockfile';
import { runAsyncHandler } from '../utils';
import { loadNativeModule } from '../../spec-common/commonUtils';
import { getCLIHost } from '../../spec-common/cliHost';
import { ContainerError } from '../../spec-common/errors';
import { uriToFsPath } from '../../spec-configuration/configurationCommonUtils';
import { workspaceFromPath } from '../../spec-utils/workspaces';
import { readDevContainerConfigFile } from '../configContainer';
import { URI } from 'vscode-uri';


interface JsonOutput {
installOrder?: {
Expand Down Expand Up @@ -61,28 +68,28 @@ async function featuresResolveDependencies({
configPath = path.join(workspaceFolder, '.devcontainer', 'devcontainer.json');
}

// Load dev container config
const buffer = await readLocalFile(configPath);
if (!buffer) {
output.write(`Could not load devcontainer.json file from path ${configPath}`, LogLevel.Error);
process.exit(1);
}
const params = {
output,
env: process.env,
};

// Parse dev container config
const config: DevContainerConfig = jsonc.parse(buffer.toString());
if (!config || !config.features) {
output.write(`No Features object in configuration '${configPath}'`, LogLevel.Error);
process.exit(1);
const cwd = workspaceFolder || process.cwd();
const cliHost = await getCLIHost(cwd, loadNativeModule, true);
const workspace = workspaceFromPath(cliHost.path, workspaceFolder);
const configFile: URI = URI.file(path.resolve(process.cwd(), configPath));
const configs = await readDevContainerConfigFile(cliHost, workspace, configFile, false, output, undefined, undefined);

if (configFile && !configs) {
throw new ContainerError({ description: `Dev container config (${uriToFsPath(configFile, cliHost.platform)}) not found.` });
}
const configWithRaw = configs!.config;
const { config } = configWithRaw;

const userFeaturesConfig = userFeaturesToArray(config);
if (!userFeaturesConfig) {
output.write(`Could not parse features object in configuration '${configPath}'`, LogLevel.Error);
process.exit(1);
}
const params = {
output,
env: process.env,
};

const { lockfile } = await readLockfile(config);
const processFeature = async (_userFeature: DevContainerFeature) => {
Expand Down