From f57f6a7402965d7c95eb0b73af2608f779770e99 Mon Sep 17 00:00:00 2001
From: Omer Farooq <omer.farooq@countdown.co.nz>
Date: Sun, 23 Aug 2020 14:26:39 +1200
Subject: [PATCH] modify ends with .yaml check to contains .yaml

---
 .../processors/AzureApiReaderProcessor.test.ts   |  2 +-
 .../ingestion/processors/YamlProcessor.test.ts   | 16 ++++++++++++++++
 .../src/ingestion/processors/YamlProcessor.ts    |  2 +-
 .../RegisterComponentPage.tsx                    |  4 +---
 .../register-component/src/util/validate.test.ts |  3 ++-
 plugins/register-component/src/util/validate.ts  |  4 ++--
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts
index 35101b2607..0ef111fcb1 100644
--- a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts
@@ -16,7 +16,7 @@
 
 import { AzureApiReaderProcessor } from './AzureApiReaderProcessor';
 
-describe('BitbucketApiReaderProcessor', () => {
+describe('AzureApiReaderProcessor', () => {
   it('should build raw api', () => {
     const processor = new AzureApiReaderProcessor();
     const tests = [
diff --git a/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.test.ts
index 587793a6de..9f1ede3f9e 100644
--- a/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.test.ts
@@ -51,6 +51,22 @@ describe('YamlProcessor', () => {
     expect(never).not.toBeCalled();
   });
 
+  it('should process url that contains yaml', async () => {
+    const containsYamlLocationSpec = {
+      type: 'url',
+      target: 'http://example.com/component?path=test.yaml&c=1&d=2',
+    };
+
+    const buffer = Buffer.from([]);
+    const emit = jest.fn();
+
+    expect(
+      await processor.parseData(buffer, containsYamlLocationSpec, emit),
+    ).toBe(true);
+
+    expect(emit).toBeCalled();
+  });
+
   it('should process entity with yaml', async () => {
     const entity = {
       apiVersion: 'backstage.io/v1alpha1',
diff --git a/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.ts
index 6a2b5cf419..79ae55fae1 100644
--- a/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/YamlProcessor.ts
@@ -26,7 +26,7 @@ export class YamlProcessor implements LocationProcessor {
     location: LocationSpec,
     emit: LocationProcessorEmit,
   ): Promise<boolean> {
-    if (!location.target.match(/\.ya?ml$/)) {
+    if (!location.target.match(/\.ya?ml/)) {
       return false;
     }
 
diff --git a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx b/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx
index 1f0eb4fead..e61f904347 100644
--- a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx
+++ b/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx
@@ -86,9 +86,7 @@ const RegisterComponentPage: FC<{}> = () => {
         { url: /.*/, type: 'github' },
       ];
 
-      const type = typeMapping.filter(item => {
-        return new RegExp(item.url).test(target);
-      })[0].type;
+      const type = typeMapping.filter(item => item.url.test(target))[0].type;
 
       const data = await catalogApi.addLocation(type, target);
 
diff --git a/plugins/register-component/src/util/validate.test.ts b/plugins/register-component/src/util/validate.test.ts
index d062655bd2..e4fc90699b 100644
--- a/plugins/register-component/src/util/validate.test.ts
+++ b/plugins/register-component/src/util/validate.test.ts
@@ -31,11 +31,12 @@ describe('ComponentIdValidators', () => {
     });
   });
   describe('yamlValidator', () => {
-    const errorMessage = "Must end with '.yaml'.";
+    const errorMessage = "Must contain '.yaml'.";
     test.each([
       [true, '.yaml'],
       [true, 'http://example.com/blob/master/service.yaml'],
       [true, 'https://example.yaml'],
+      [true, 'https://example.com?path=abc.yaml&c=1'],
       [errorMessage, '.yml'],
       [errorMessage, 'http://example.com/blob/master/service'],
       [errorMessage, undefined],
diff --git a/plugins/register-component/src/util/validate.ts b/plugins/register-component/src/util/validate.ts
index 78d20995f5..8552872015 100644
--- a/plugins/register-component/src/util/validate.ts
+++ b/plugins/register-component/src/util/validate.ts
@@ -19,6 +19,6 @@ export const ComponentIdValidators = {
     (typeof value === 'string' && value.match(/^https:\/\//) !== null) ||
     'Must start with https://.',
   yamlValidator: (value: any) =>
-    (typeof value === 'string' && value.match(/.yaml$/) !== null) ||
-    "Must end with '.yaml'.",
+    (typeof value === 'string' && value.match(/.yaml/) !== null) ||
+    "Must contain '.yaml'.",
 };