Skip to content

Commit 914e854

Browse files
authored
Merge pull request #107 from bharathGuntamadugu/feature/smus
Revert "Merge pull request #101 from bharathGuntamadugu/feature/smus"
2 parents 0f20b9c + 5559823 commit 914e854

File tree

8 files changed

+30
-3853
lines changed

8 files changed

+30
-3853
lines changed

patched-vscode/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
"update-build-ts-version": "yarn add typescript@next && tsc -p ./build/tsconfig.build.json"
6868
},
6969
"dependencies": {
70-
"@aws-sdk/credential-providers": "^3.388.0",
7170
"@microsoft/1ds-core-js": "^3.2.13",
7271
"@microsoft/1ds-post-js": "^3.2.13",
7372
"@parcel/watcher": "2.1.0",

patched-vscode/remote/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"@aws-sdk/credential-providers": "^3.388.0",
76
"@microsoft/1ds-core-js": "^3.2.13",
87
"@microsoft/1ds-post-js": "^3.2.13",
98
"@parcel/watcher": "2.1.0",

patched-vscode/remote/yarn.lock

Lines changed: 0 additions & 851 deletions
Large diffs are not rendered by default.

patched-vscode/src/vs/server/node/webClientServer.ts

Lines changed: 3 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { createReadStream, existsSync, writeFileSync } from 'fs';
6+
import { createReadStream } from 'fs';
77
import {readFile } from 'fs/promises';
88
import { Promises } from 'vs/base/node/pfs';
99
import * as path from 'path';
@@ -30,7 +30,6 @@ import { IProductConfiguration } from 'vs/base/common/product';
3030
import { isString } from 'vs/base/common/types';
3131
import { CharCode } from 'vs/base/common/charCode';
3232
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
33-
import { fromIni } from "@aws-sdk/credential-providers"
3433

3534
const textMimeType: { [ext: string]: string | undefined } = {
3635
'.html': 'text/html',
@@ -103,8 +102,6 @@ export class WebClientServer {
103102
private readonly _callbackRoute: string;
104103
private readonly _webExtensionRoute: string;
105104
private readonly _idleRoute: string;
106-
private readonly _envMetadata: string;
107-
private readonly _derCreds: string;
108105

109106
constructor(
110107
private readonly _connectionToken: ServerConnectionToken,
@@ -121,8 +118,6 @@ export class WebClientServer {
121118
this._callbackRoute = `${serverRootPath}/callback`;
122119
this._webExtensionRoute = `${serverRootPath}/web-extension-resource`;
123120
this._idleRoute = '/api/idle';
124-
this._envMetadata = '/api/env';
125-
this._derCreds = '/api/creds';
126121
}
127122

128123
/**
@@ -151,12 +146,6 @@ export class WebClientServer {
151146
// extension resource support
152147
return this._handleWebExtensionResource(req, res, parsedUrl);
153148
}
154-
if (pathname === this._envMetadata) {
155-
return this._handleEnvMetadata(req, res);
156-
}
157-
if (pathname === this._derCreds) {
158-
return this._handleDERCreds(req, res);
159-
}
160149

161150
return serveError(req, res, 404, 'Not found.');
162151
} catch (error) {
@@ -470,20 +459,12 @@ export class WebClientServer {
470459
}
471460

472461
/**
473-
* Handles API requests to retrieve the last activity timestamp.
474-
*/
462+
* Handles API requests to retrieve the last activity timestamp.
463+
*/
475464
private async _handleIdle(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
476465
try {
477466
const tmpDirectory = '/tmp/'
478467
const idleFilePath = path.join(tmpDirectory, '.sagemaker-last-active-timestamp');
479-
480-
// If idle shutdown file does not exist, this indicates the app UI may never been opened
481-
// Create the initial metadata file
482-
if (!existsSync(idleFilePath)) {
483-
const timestamp = new Date().toISOString();
484-
writeFileSync(idleFilePath, timestamp);
485-
}
486-
487468
const data = await readFile(idleFilePath, 'utf8');
488469

489470
res.statusCode = 200;
@@ -493,49 +474,6 @@ export class WebClientServer {
493474
serveError(req, res, 500, error.message)
494475
}
495476
}
496-
497-
/**
498-
* Handles API requests to retrieve the /opt/ml/metadata/resource-metadata.json file.
499-
*/
500-
private async _handleEnvMetadata(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
501-
try {
502-
const envMetadataDirectory = '/opt/ml/metadata/';
503-
const envMetadataFilePath = path.join(envMetadataDirectory, 'resource-metadata.json');
504-
if (existsSync(envMetadataFilePath)) {
505-
const envMetadata = await readFile(envMetadataFilePath, 'utf8');
506-
res.statusCode = 200;
507-
res.setHeader('Content-Type', 'application/json');
508-
res.end(envMetadata);
509-
} else {
510-
serveError(req, res, 500, 'No metadata file at ' + envMetadataFilePath);
511-
}
512-
} catch (error) {
513-
serveError(req, res, 500, error.message);
514-
}
515-
}
516-
517-
/**
518-
* Handles API requests to retrieve the /opt/ml/metadata/resource-metadata.json file.
519-
*/
520-
private async _handleDERCreds(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
521-
try {
522-
const derCreds = await fromIni({
523-
profile: "DomainExecutionRoleCreds"
524-
})();
525-
const creds = {
526-
access_key: derCreds.accessKeyId,
527-
secret_key: derCreds.secretAccessKey,
528-
session_token: derCreds.sessionToken
529-
};
530-
res.statusCode = 200;
531-
res.setHeader('Content-Type', 'application/json');
532-
res.setHeader('Cache-Control', 'no-store');
533-
res.setHeader('Expires', '0');
534-
res.end(JSON.stringify(creds));
535-
} catch (error) {
536-
serveError(req, res, 500, error.message);
537-
}
538-
}
539477
}
540478

541479
/**

0 commit comments

Comments
 (0)