koszewscy/ado-sk-toolkit-extension
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: replace requireVariable and requireInput with task-lib equivalents and improve error handling

Browse Source
This commit is contained in:
Sławek Koszewski
2026-02-25 21:12:40 +01:00
parent 8e9224cff9
commit 2c2981d791
10 changed files with 59 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
task/AzureFederatedAuth/src/index.ts
View File

@@ -4,21 +4,27 @@ import {
buildOidcUrl,
exchangeOidcForScopedToken,
getServiceConnectionMetadata,
requestOidcToken,
requireInput,
requireVariable
requestOidcToken
} from '@skoszewski/ado-sk-toolkit-shared';
const AZDO_APP_SCOPE = '499b84ac-1321-427f-aa17-267ca6975798/.default';
async function run(): Promise<void> {
try {
const endpointId = requireInput('serviceConnectionARM');
const endpointId = tl.getInputRequired('serviceConnectionARM');
const setGitAccessToken = tl.getBoolInput('setGitAccessToken', false);
const printTokenHashes = tl.getBoolInput('printTokenHashes', false);
const oidcBaseUrl = requireVariable('System.OidcRequestUri');
const accessToken = requireVariable('System.AccessToken');
const oidcBaseUrl = tl.getVariable('System.OidcRequestUri');
const accessToken = tl.getVariable('System.AccessToken');
if (oidcBaseUrl === undefined) {
throw new Error('Missing required pipeline variable: System.OidcRequestUri.');
}
if (accessToken === undefined) {
throw new Error('Missing required pipeline variable: System.AccessToken.');
}
console.log('Requesting OIDC token for ARM authentication...');

15
task/CopyBlob/src/index.ts
View File

@@ -1,8 +1,7 @@
import * as tl from 'azure-pipelines-task-lib/task';
import {
buildBlobUrl,
requestStorageAccessToken,
requireInput
requestStorageAccessToken
} from '@skoszewski/ado-sk-toolkit-shared';
async function copyBlob(
@@ -38,12 +37,12 @@ async function copyBlob(
async function run(): Promise<void> {
try {
const endpointId = requireInput('serviceConnectionARM');
const srcStorageAccountName = requireInput('srcStorageAccountName');
const dstStorageAccountName = requireInput('dstStorageAccountName');
const srcContainerName = requireInput('srcContainerName');
const dstContainerNameInput = tl.getInput('dstContainerName', false)?.trim() || '';
const blobName = requireInput('blobName');
const endpointId = tl.getInputRequired('serviceConnectionARM');
const srcStorageAccountName = tl.getInputRequired('srcStorageAccountName');
const dstStorageAccountName = tl.getInputRequired('dstStorageAccountName');
const srcContainerName = tl.getInputRequired('srcContainerName');
const dstContainerNameInput = tl.getInput('dstContainerName', false) || '';
const blobName = tl.getInputRequired('blobName');
console.log('Requesting storage access token from Microsoft Entra ID...');
const accessToken = await requestStorageAccessToken(endpointId);

13
task/GetBlob/src/index.ts
View File

@@ -3,8 +3,7 @@ import * as path from 'node:path';
import * as tl from 'azure-pipelines-task-lib/task';
import {
buildBlobUrl,
requestStorageAccessToken,
requireInput
requestStorageAccessToken
} from '@skoszewski/ado-sk-toolkit-shared';
async function downloadBlob(blobUrl: string, bearerToken: string): Promise<Buffer> {
@@ -28,11 +27,11 @@ async function downloadBlob(blobUrl: string, bearerToken: string): Promise<Buffe
async function run(): Promise<void> {
try {
const endpointId = requireInput('serviceConnectionARM');
const storageAccountName = requireInput('storageAccountName');
const containerName = requireInput('containerName');
const blobName = requireInput('blobName');
const destinationPath = requireInput('destinationPath');
const endpointId = tl.getInputRequired('serviceConnectionARM');
const storageAccountName = tl.getInputRequired('storageAccountName');
const containerName = tl.getInputRequired('containerName');
const blobName = tl.getInputRequired('blobName');
const destinationPath = tl.getInputRequired('destinationPath');
console.log('Requesting storage access token from Microsoft Entra ID...');
const accessToken = await requestStorageAccessToken(endpointId);

13
task/ListBlobs/src/index.ts
View File

@@ -1,7 +1,6 @@
import * as tl from 'azure-pipelines-task-lib/task';
import {
requestStorageAccessToken,
requireInput
requestStorageAccessToken
} from '@skoszewski/ado-sk-toolkit-shared';
function decodeXmlValue(value: string): string {
@@ -60,11 +59,11 @@ async function listBlobs(listUrl: string, bearerToken: string): Promise<string[]
async function run(): Promise<void> {
try {
const endpointId = requireInput('serviceConnectionARM');
const storageAccountName = requireInput('storageAccountName');
const containerName = requireInput('containerName');
const prefix = tl.getInput('prefix', false)?.trim() || '';
const maxResultsRaw = tl.getInput('maxResults', false)?.trim() || '1000';
const endpointId = tl.getInputRequired('serviceConnectionARM');
const storageAccountName = tl.getInputRequired('storageAccountName');
const containerName = tl.getInputRequired('containerName');
const prefix = tl.getInput('prefix', false) || '';
const maxResultsRaw = tl.getInput('maxResults', false) || '1000';
const maxResults = Number.parseInt(maxResultsRaw, 10);
if (!Number.isInteger(maxResults) || maxResults <= 0) {

15
task/PutBlob/src/index.ts
View File

@@ -2,8 +2,7 @@ import * as fs from 'node:fs/promises';
import * as tl from 'azure-pipelines-task-lib/task';
import {
buildBlobUrl,
requestStorageAccessToken,
requireInput
requestStorageAccessToken
} from '@skoszewski/ado-sk-toolkit-shared';
async function uploadBlob(
@@ -35,12 +34,12 @@ async function uploadBlob(
async function run(): Promise<void> {
try {
const endpointId = requireInput('serviceConnectionARM');
const storageAccountName = requireInput('storageAccountName');
const containerName = requireInput('containerName');
const blobName = requireInput('blobName');
const sourcePath = requireInput('sourcePath');
const contentType = tl.getInput('contentType', false)?.trim() || 'application/octet-stream';
const endpointId = tl.getInputRequired('serviceConnectionARM');
const storageAccountName = tl.getInputRequired('storageAccountName');
const containerName = tl.getInputRequired('containerName');
const blobName = tl.getInputRequired('blobName');
const sourcePath = tl.getInputRequired('sourcePath');
const contentType = tl.getInput('contentType', false) || 'application/octet-stream';
console.log('Requesting storage access token from Microsoft Entra ID...');
const accessToken = await requestStorageAccessToken(endpointId);