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

update to use getEntityByRef

Browse Source 
Signed-off-by: Fredrik Adelöw <freben@gmail.com>
This commit is contained in:
Fredrik Adelöw
2022-03-03 11:26:42 +01:00
parent a52f69987a
commit 899f196af5
41 changed files with 157 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts
+10 -10
View File
@@ -160,7 +160,7 @@ describe('JenkinsConfig', () => {
describe('DefaultJenkinsInfoProvider', () => {
const mockCatalog: jest.Mocked<CatalogApi> = {
getEntityByName: jest.fn(),
getEntityByRef: jest.fn(),
} as any as jest.Mocked<CatalogApi>;
const entityRef: CompoundEntityRef = {
@@ -171,7 +171,7 @@ describe('DefaultJenkinsInfoProvider', () => {
function configureProvider(configData: any, entityData: any) {
const config = new ConfigReader(configData);
mockCatalog.getEntityByName.mockReturnValueOnce(
mockCatalog.getEntityByRef.mockReturnValueOnce(
Promise.resolve(entityData as Entity),
);
@@ -185,7 +185,7 @@ describe('DefaultJenkinsInfoProvider', () => {
const provider = configureProvider({ jenkins: {} }, undefined);
await expect(provider.getInstance({ entityRef })).rejects.toThrowError();
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
});
it('Reads simple config and annotation', async () => {
@@ -207,7 +207,7 @@ describe('DefaultJenkinsInfoProvider', () => {
);
const info: JenkinsInfo = await provider.getInstance({ entityRef });
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
expect(info).toStrictEqual({
baseUrl: 'https://jenkins.example.com',
crumbIssuer: undefined,
@@ -243,7 +243,7 @@ describe('DefaultJenkinsInfoProvider', () => {
);
const info: JenkinsInfo = await provider.getInstance({ entityRef });
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
expect(info).toMatchObject({
baseUrl: 'https://jenkins.example.com',
jobFullName: 'teamA/artistLookup-build',
@@ -280,7 +280,7 @@ describe('DefaultJenkinsInfoProvider', () => {
);
const info: JenkinsInfo = await provider.getInstance({ entityRef });
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
expect(info).toMatchObject({
baseUrl: 'https://jenkins.example.com',
jobFullName: 'teamA/artistLookup-build',
@@ -317,7 +317,7 @@ describe('DefaultJenkinsInfoProvider', () => {
);
const info: JenkinsInfo = await provider.getInstance({ entityRef });
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
expect(info).toMatchObject({
baseUrl: 'https://jenkins-other.example.com',
jobFullName: 'teamA/artistLookup-build',
@@ -343,7 +343,7 @@ describe('DefaultJenkinsInfoProvider', () => {
);
const info: JenkinsInfo = await provider.getInstance({ entityRef });
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
expect(info).toMatchObject({
baseUrl: 'https://jenkins.example.com',
jobFullName: 'teamA/artistLookup-build',
@@ -369,7 +369,7 @@ describe('DefaultJenkinsInfoProvider', () => {
);
const info: JenkinsInfo = await provider.getInstance({ entityRef });
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
expect(info).toMatchObject({
baseUrl: 'https://jenkins.example.com',
jobFullName: 'teamA/artistLookup-build',
@@ -400,7 +400,7 @@ describe('DefaultJenkinsInfoProvider', () => {
);
const info: JenkinsInfo = await provider.getInstance({ entityRef });
expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
expect(mockCatalog.getEntityByRef).toBeCalledWith(entityRef);
expect(info).toMatchObject({
baseUrl: 'https://jenkins-other.example.com',
jobFullName: 'teamA/artistLookup-build',
plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts
+1 -1
View File
@@ -186,7 +186,7 @@ export class DefaultJenkinsInfoProvider implements JenkinsInfoProvider {
jobFullName?: string;
}): Promise<JenkinsInfo> {
// load entity
const entity = await this.catalog.getEntityByName(opt.entityRef);
const entity = await this.catalog.getEntityByRef(opt.entityRef);
if (!entity) {
throw new Error(
`Couldn't find entity with name: ${stringifyEntityRef(opt.entityRef)}`,