From b19ea927afe58ae892e452ca71daa2f5a8791a02 Mon Sep 17 00:00:00 2001 From: "TANGUY Antoine (SIB)" Date: Wed, 21 Sep 2022 15:18:49 +0200 Subject: [PATCH] fix(jenkins-backend): use same config prop name Signed-off-by: TANGUY Antoine (SIB) --- .changeset/quiet-hats-kick.md | 5 +++++ .../jenkins-backend/src/service/jenkinsInfoProvider.test.ts | 4 ++-- plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changeset/quiet-hats-kick.md diff --git a/.changeset/quiet-hats-kick.md b/.changeset/quiet-hats-kick.md new file mode 100644 index 0000000000..155d8f232c --- /dev/null +++ b/.changeset/quiet-hats-kick.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-jenkins-backend': patch +--- + +fix incorrect jenkins backend config initialization. named config and non named config use extraRequestHeaders diff --git a/plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts index 8e14997fd7..626e5b0a5a 100644 --- a/plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts +++ b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts @@ -55,7 +55,7 @@ describe('JenkinsConfig', () => { baseUrl: 'https://jenkins.example.com', username: 'backstage - bot', apiKey: '123456789abcdef0123456789abcedf012', - headers: { + extraRequestHeaders: { myHeader: 'my-value', }, }, @@ -70,7 +70,7 @@ describe('JenkinsConfig', () => { baseUrl: 'https://jenkins.example.com', username: 'backstage - bot', apiKey: '123456789abcdef0123456789abcedf012', - headers: { + extraRequestHeaders: { myHeader: 'my-value', }, }, diff --git a/plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts index 2ad5b60f6d..c4b4ef58dd 100644 --- a/plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts +++ b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts @@ -84,7 +84,7 @@ export class JenkinsConfig { baseUrl: c.getString('baseUrl'), username: c.getString('username'), apiKey: c.getString('apiKey'), - headers: c.getOptional('headers'), + extraRequestHeaders: c.getOptional('extraRequestHeaders'), crumbIssuer: c.getOptionalBoolean('crumbIssuer'), })) || [];