paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 20 Packages Projects Releases Wiki Activity

Made config truly optional

Browse Source 
Signed-off-by: Andre Wanlin <awanlin@spotify.com>
This commit is contained in:
Andre Wanlin
2024-03-11 10:20:07 +01:00
parent 2f77e24fe5
commit d54d3c6748
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts
+17 -7
View File
@@ -108,10 +108,17 @@ export class AzureDevOpsApi {
// If no host or org is provided we fall back to the values from the `azureDevOps` config section
// these may have been setup in the `integrations.azure` config section
// which is why use them here and not just falling back on them entirely
const validHost = host ?? this.config.getString('azureDevOps.host');
const validOrg = org ?? this.config.getString('azureDevOps.organization');
const url = `https://${validHost}/${encodeURIComponent(validOrg)}`;
const validHost = host ?? this.config.getOptionalString('azureDevOps.host');
const validOrg =
org ?? this.config.getOptionalString('azureDevOps.organization');
if (!validHost || !validOrg) {
throw new Error(
"No 'host' or 'org' provided in annotations or configuration, unable to retrieve needed credentials",
);
}
const url = `https://${validHost}/${encodeURIComponent(validOrg)}`;
const credentials = await this.credentialsProvider.getCredentials({
url,
});
@@ -120,12 +127,15 @@ export class AzureDevOpsApi {
if (!credentials) {
// No credentials found for the provided host and org in the `integrations.azure` config section
// use the fall back personal access token from `azureDevOps.token`
const token = this.config.getString('azureDevOps.token');
if (token) {
this.logger.warn(
"Using the token from 'azureDevOps.token' has been deprecated, use 'integrations.azure' instead, for more details see: https://backstage.io/docs/integrations/azure/locations",
const token = this.config.getOptionalString('azureDevOps.token');
if (!token) {
throw new Error(
"No 'azureDevOps.token' provided in configuration and credentials were not found in 'integrations.azure', unable to proceed",
);
}
this.logger.warn(
"Using the token from 'azureDevOps.token' has been deprecated, use 'integrations.azure' instead, for more details see: https://backstage.io/docs/integrations/azure/locations",
);
authHandler = getPersonalAccessTokenHandler(token);
} else {
authHandler = getHandlerFromToken(credentials.token);