Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
13 changes: 13 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,19 @@
"${workspaceFolder}/vscode-extensions/rush-vscode-extension/dist/**/*.js"
]
// "preLaunchTask": "npm: build:watch - vscode-extensions/rush-vscode-extension"
},
{
"name": "Launch TLS Certification UI",
"type": "extensionHost",
"request": "launch",
"cwd": "${workspaceFolder}/vscode-extensions/tls-certification-ui",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}/vscode-extensions/tls-certification-ui"
],
"outFiles": [
"${workspaceFolder}/vscode-extensions/tls-certification-ui/dist/**/*.js"
]
// "preLaunchTask": "npm: build:watch - vscode-extensions/tls-certification-ui"
}
]
}
147 changes: 71 additions & 76 deletions build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions common/config/azure-pipelines/tls-certification-ui-publish.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
variables:
- name: FORCE_COLOR
value: 1

resources:
repositories:
- repository: 1esPipelines
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

extends:
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
parameters:
pool:
name: Azure-Pipelines-1ESPT-ExDShared
os: windows
stages:
- stage:
jobs:
- job:
pool:
name: publish-tls-certification-ui
os: linux
steps:
- checkout: self
persistCredentials: true

- template: /common/config/azure-pipelines/templates/install-node.yaml@self

- template: /common/config/azure-pipelines/templates/build.yaml@self
parameters:
BuildParameters: >
--to rushstack
PerformValidation: false

- script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js package
workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/tls-certification-ui
displayName: 'Package tls certification ui extension'

- script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js deploy
workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/tls-certification-ui
displayName: 'Publish tls certification ui extension'
env:
VSCE_PAT: $(vscePat)
Comment on lines +37 to +45

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to just replicate these two steps for each extension folder in the repository, and keep it all in one pipeline.

2 changes: 1 addition & 1 deletion common/config/rush/browser-approved-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
{
"name": "@rushstack/rush-vscode-command-webview",
"allowedCategories": [ "vscode-extensions" ]
"allowedCategories": [ "tests", "vscode-extensions" ]
},
{
"name": "axios",
Expand Down
14 changes: 7 additions & 7 deletions common/config/rush/nonbrowser-approved-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
},
{
"name": "@rushstack/debug-certificate-manager",
"allowedCategories": [ "libraries" ]
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
},
{
"name": "@rushstack/eslint-config",
Expand Down Expand Up @@ -204,7 +204,7 @@
},
{
"name": "@rushstack/package-extractor",
"allowedCategories": [ "libraries", "vscode-extensions" ]
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
},
{
"name": "@rushstack/rig-package",
Expand Down Expand Up @@ -264,7 +264,7 @@
},
{
"name": "@rushstack/webpack-preserve-dynamic-require-plugin",
"allowedCategories": [ "libraries", "vscode-extensions" ]
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
},
{
"name": "@rushstack/webpack4-localization-plugin",
Expand Down Expand Up @@ -356,7 +356,7 @@
},
{
"name": "@vscode/test-electron",
"allowedCategories": [ "vscode-extensions" ]
"allowedCategories": [ "tests", "vscode-extensions" ]
},
{
"name": "@yarnpkg/lockfile",
Expand Down Expand Up @@ -516,7 +516,7 @@
},
{
"name": "glob",
"allowedCategories": [ "libraries", "vscode-extensions" ]
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
},
{
"name": "glob-escape",
Expand Down Expand Up @@ -672,7 +672,7 @@
},
{
"name": "mocha",
"allowedCategories": [ "vscode-extensions" ]
"allowedCategories": [ "tests", "vscode-extensions" ]
},
{
"name": "node-fetch",
Expand Down Expand Up @@ -852,7 +852,7 @@
},
{
"name": "vsce",
"allowedCategories": [ "vscode-extensions" ]
"allowedCategories": [ "tests", "vscode-extensions" ]
},
{
"name": "watchpack",
Expand Down
87 changes: 78 additions & 9 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/config/rush/repo-state.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
{
"pnpmShrinkwrapHash": "eea8b6e9184ef13a202936a9b855668654757e62",
"pnpmShrinkwrapHash": "dc4624f648069e498a0c46255b0349827d6f9972",
"preferredVersionsHash": "40d4640a94cff77f7808a2f1960cc76231eb6f86"
}
30 changes: 30 additions & 0 deletions rush-plugins/rush-azure-storage-build-cache-plugin/src/test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { DeviceCodeCredential } from '@azure/identity';
import { ITerminal } from '@rushstack/node-core-library';
import { IAzureAuthenticationConfiguration, ICredentialResultWithId } from './RushAzureInteractiveAuthPlugin';

async function fetchCredentialsUsingDeviceCodeAsync(
deviceCodeCredential: DeviceCodeCredential,
terminal: ITerminal,
options: IAzureAuthenticationConfiguration
): Promise<ICredentialResultWithId> {
const { keyVaultSecretName = '' } = options;

// const keyVaultCredential: KeyVaultAuthentication = new KeyVaultAuthentication({
// vaultName: keyVaultName,
// secretName: keyVaultSecretName,
// deviceCodeCredentails: deviceCodeCredential
// });

// const keyVaultCoreCredentials: ICredentialResult =
// await keyVaultCredential._getCredentialFromDeviceCodeAsync(terminal, deviceCodeCredential);
const keyVaultCacheId: string = `azure-key-vault|AzurePublicCloud|odsp-web-tests|${keyVaultSecretName}`;

return {
credentialId: keyVaultCacheId,
credential: {
credentialString: 'succesafjoisaef'
}
};
}

export { fetchCredentialsUsingDeviceCodeAsync };
6 changes: 6 additions & 0 deletions rush.json
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,12 @@
"reviewCategory": "tests",
"shouldPublish": false
},
{
"packageName": "tls-certification-ui",
"projectFolder": "vscode-extensions/tls-certification-ui",
"reviewCategory": "tests",
"shouldPublish": false
},
{
"packageName": "ts-command-line-test",
"projectFolder": "build-tests/ts-command-line-test",
Expand Down
10 changes: 10 additions & 0 deletions vscode-extensions/rush-vscode-extension/config/heft.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@
"scriptPath": "lib/scripts/generate-vscodeignore.js"
}
}
},
"generate-tls-certificate": {
"taskDependencies": ["copy-webview", "typescript", "webpack"],
"taskPlugin": {
"pluginPackage": "@rushstack/heft",
"pluginName": "run-script-plugin",
"options": {
"scriptPath": "lib/scripts/generate-tls-certificate.js"
}
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion vscode-extensions/rush-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@
"@rushstack/rush-sdk": "workspace:*",
"@rushstack/ts-command-line": "workspace:*",
"@rushstack/rush-vscode-command-webview": "workspace:*",
"@rushstack/terminal": "workspace:*"
"@rushstack/terminal": "workspace:*",
"@rushstack/debug-certificate-manager": "workspace:*"
},
"devDependencies": {
"@microsoft/rush-lib": "workspace:*",
Expand Down
Loading