Skip to content

Commit b4fc71b

Browse files
author
Bowden Kelly
authored
Merge pull request microsoft#66420 from sana-ajani/master
Python Azure tagging fixes
2 parents 957f536 + 9b65b49 commit b4fc71b

1 file changed

Lines changed: 24 additions & 7 deletions

File tree

‎src/vs/workbench/parts/stats/node/workspaceStats.ts‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,26 @@ const PyModulesToLookFor = [
7171
'azure-storage-blob',
7272
'azure-storage-file',
7373
'azure-storage-queue',
74-
'azure-mgmt',
7574
'azure-shell',
7675
'azure-cosmos',
7776
'azure-devtools',
7877
'azure-elasticluster',
7978
'azure-eventgrid',
8079
'azure-functions',
8180
'azure-graphrbac',
82-
'azure-keybault',
81+
'azure-keyvault',
8382
'azure-loganalytics',
8483
'azure-monitor',
8584
'azure-servicebus',
8685
'azure-servicefabric',
8786
'azure-storage',
8887
'azure-translator',
89-
'azure-iothub-device-client'
88+
'azure-iothub-device-client',
89+
'adal',
90+
'pydocumentdb',
91+
'botbuilder-core',
92+
'botbuilder-schema',
93+
'botframework-connector'
9094
];
9195

9296
type Tags = { [index: string]: boolean | number | string | undefined };
@@ -299,15 +303,22 @@ export class WorkspaceStats implements IWorkbenchContribution {
299303
"workspace.py.azure-eventgrid" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
300304
"workspace.py.azure-functions" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
301305
"workspace.py.azure-graphrbac" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
302-
"workspace.py.azure-keybault" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
306+
"workspace.py.azure-keyvault" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
303307
"workspace.py.azure-loganalytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
304308
"workspace.py.azure-monitor" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
305309
"workspace.py.azure-servicebus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
306310
"workspace.py.azure-servicefabric" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
307311
"workspace.py.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
308312
"workspace.py.azure-translator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
309313
"workspace.py.azure-iothub-device-client" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
314+
"workspace.py.azure-ml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
310315
"workspace.py.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
316+
"workspace.py.adal" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
317+
"workspace.py.pydocumentdb" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
318+
"workspace.py.botbuilder-core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
319+
"workspace.py.botbuilder-schema" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
320+
"workspace.py.botframework-connector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
321+
311322
}
312323
*/
313324
private resolveWorkspaceTags(configuration: IWindowConfiguration, participant?: (rootFiles: string[]) => void): Promise<Tags> {
@@ -433,15 +444,21 @@ export class WorkspaceStats implements IWorkbenchContribution {
433444
}
434445
// cognitive services has a lot of tiny packages. eg. 'azure-cognitiveservices-search-autosuggest'
435446
if (packageName.indexOf('azure-cognitiveservices') > -1) {
436-
tags['workspace.py.cognitiveservices'] = true;
447+
tags['workspace.py.azure-cognitiveservices'] = true;
448+
}
449+
if (packageName.indexOf('azure-mgmt') > -1) {
450+
tags['workspace.py.azure-mgmt'] = true;
451+
}
452+
if (packageName.indexOf('azure-ml') > -1) {
453+
tags['workspace.py.azure-ml'] = true;
437454
}
438455
if (!tags['workspace.py.any-azure']) {
439456
tags['workspace.py.any-azure'] = /azure/i.test(packageName);
440457
}
441458
}
442459

443460
const requirementsTxtPromises = getFilePromises('requirements.txt', this.fileService, content => {
444-
const dependencies: string[] = content.value.split('\r\n|\n');
461+
const dependencies: string[] = content.value.split(/\r\n|\r|\n/);
445462
for (let dependency of dependencies) {
446463
// Dependencies in requirements.txt can have 3 formats: `foo==3.1, foo>=3.1, foo`
447464
const format1 = dependency.split('==');
@@ -452,7 +469,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
452469
});
453470

454471
const pipfilePromises = getFilePromises('pipfile', this.fileService, content => {
455-
let dependencies: string[] = content.value.split(/\r\n|\n/);
472+
let dependencies: string[] = content.value.split(/\r\n|\r|\n/);
456473

457474
// We're only interested in the '[packages]' section of the Pipfile
458475
dependencies = dependencies.slice(dependencies.indexOf('[packages]') + 1);

0 commit comments

Comments
 (0)