Skip to content

Commit e78d7b1

Browse files
add logs
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent 00ea39d commit e78d7b1

4 files changed

Lines changed: 47 additions & 4 deletions

File tree

code/src/vs/platform/extensionManagement/common/allowedExtensionsService.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,21 @@ export class AllowedExtensionsService extends Disposable implements IAllowedExte
7878
private getDefaultExtensionsEnv(): string | undefined {
7979
// First check if it was set via setter (workbench context)
8080
if (this._defaultExtensionsEnv !== undefined) {
81+
console.log('!!!!!!!! AllowedExtensionsService.getDefaultExtensionsEnv - from setter:', this._defaultExtensionsEnv);
8182
return this._defaultExtensionsEnv;
8283
}
8384

8485
// Try process.env (server/Node.js context)
85-
if (typeof process !== 'undefined' && process.env && process.env['DEFAULT_EXTENSIONS']) {
86-
return process.env['DEFAULT_EXTENSIONS'];
86+
if (typeof process !== 'undefined' && process.env) {
87+
const envValue = process.env['DEFAULT_EXTENSIONS'];
88+
console.log('!!!!!!!! AllowedExtensionsService.getDefaultExtensionsEnv - from process.env:', envValue);
89+
console.log('!!!!!!!! AllowedExtensionsService.getDefaultExtensionsEnv - typeof process:', typeof process);
90+
console.log('!!!!!!!! AllowedExtensionsService.getDefaultExtensionsEnv - process.env exists:', !!process.env);
91+
if (envValue) {
92+
return envValue;
93+
}
94+
} else {
95+
console.log('!!!!!!!! AllowedExtensionsService.getDefaultExtensionsEnv - process not available');
8796
}
8897

8998
return undefined;

code/src/vs/platform/extensionManagement/node/extensionManagementService.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
9898
@IUserDataProfilesService userDataProfilesService: IUserDataProfilesService
9999
) {
100100
super(galleryService, telemetryService, uriIdentityService, logService, productService, allowedExtensionsService, userDataProfilesService);
101+
102+
// Check if DEFAULT_EXTENSIONS environment variable is accessible
103+
const defaultExtensionsEnv = typeof process !== 'undefined' && process.env ? process.env['DEFAULT_EXTENSIONS'] : undefined;
104+
logService.info('!!!!!!!! ExtensionManagementService constructor - typeof process:', typeof process);
105+
logService.info('!!!!!!!! ExtensionManagementService constructor - process.env exists:', typeof process !== 'undefined' && !!process.env);
106+
logService.info('!!!!!!!! ExtensionManagementService constructor - DEFAULT_EXTENSIONS value:', defaultExtensionsEnv);
107+
if (typeof process !== 'undefined' && process.env) {
108+
logService.info('!!!!!!!! ExtensionManagementService constructor - process.env keys sample:', Object.keys(process.env).slice(0, 10).join(', '));
109+
}
101110
const extensionLifecycle = this._register(instantiationService.createInstance(ExtensionsLifecycle));
102111
this.extensionsScanner = this._register(instantiationService.createInstance(ExtensionsScanner, extension => extensionLifecycle.postUninstall(extension)));
103112
this.manifestCache = this._register(new ExtensionsManifestCache(userDataProfilesService, fileService, uriIdentityService, this, this.logService));

code/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,8 +2024,13 @@ class DefaultExtensionsInitializer implements IWorkbenchContribution {
20242024
) {
20252025
// Initialize AllowedExtensionsService with DEFAULT_EXTENSIONS from environment service
20262026
// This allows the service to validate extensions against the environment variable
2027-
if (environmentService.defaultExtensions) {
2028-
(allowedExtensionsService as any).setDefaultExtensionsEnv(environmentService.defaultExtensions);
2027+
const defaultExtensions = environmentService.defaultExtensions;
2028+
console.log('!!!!!!!! DefaultExtensionsInitializer - defaultExtensions from env service:', defaultExtensions);
2029+
if (defaultExtensions) {
2030+
(allowedExtensionsService as any).setDefaultExtensionsEnv(defaultExtensions);
2031+
console.log('!!!!!!!! DefaultExtensionsInitializer - set on allowedExtensionsService');
2032+
} else {
2033+
console.log('!!!!!!!! DefaultExtensionsInitializer - defaultExtensions is undefined');
20292034
}
20302035
}
20312036
}

code/src/vs/workbench/services/environment/browser/environmentService.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,26 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
266266
@memoize
267267
get editSessionId(): string | undefined { return this.options.editSessionId; }
268268

269+
@memoize
270+
get defaultExtensions(): string | undefined {
271+
// First check payload (if passed via workspace provider)
272+
if (this.payload?.has('defaultExtensions')) {
273+
const value = this.payload.get('defaultExtensions');
274+
console.log('!!!!!!!! BrowserWorkbenchEnvironmentService.defaultExtensions from payload:', value);
275+
return value;
276+
}
277+
// Fallback to process.env (for Che Code and other environments)
278+
// Note: In web environments, env may be empty, so this will return undefined
279+
const envValue = env['DEFAULT_EXTENSIONS'];
280+
console.log('!!!!!!!! BrowserWorkbenchEnvironmentService.defaultExtensions from env:', envValue);
281+
console.log('!!!!!!!! BrowserWorkbenchEnvironmentService.defaultExtensions - env object:', env);
282+
console.log('!!!!!!!! BrowserWorkbenchEnvironmentService.defaultExtensions - typeof process:', typeof process);
283+
if (typeof process !== 'undefined' && process.env) {
284+
console.log('!!!!!!!! BrowserWorkbenchEnvironmentService.defaultExtensions - process.env.DEFAULT_EXTENSIONS:', process.env['DEFAULT_EXTENSIONS']);
285+
}
286+
return envValue;
287+
}
288+
269289
private payload: Map<string, string> | undefined;
270290

271291
constructor(

0 commit comments

Comments
 (0)