Merge pull request #1101 from spotify/freben/location-fetch-store

Move addLocation to new HigherOrderOperations

packages/backend/src/plugins/catalog.ts

@@ -23,6 +23,7 @@ import {
   LocationReaders,
   IngestionModels,
   runPeriodically,
+  HigherOrderOperations,
 } from '@backstage/plugin-catalog-backend';
 import { PluginEnvironment } from '../types';
 import { EntityPolicies } from '@backstage/catalog-model';
@@ -32,7 +33,7 @@ export default async function createPlugin({
   database,
 }: PluginEnvironment) {
   const policy = new EntityPolicies();
-  const ingestion = new IngestionModels(
+  const ingestionModel = new IngestionModels(
     new LocationReaders(),
     new DescriptorParsers(),
     new EntityPolicies(),
@@ -40,12 +41,22 @@ export default async function createPlugin({
 
   const db = await DatabaseManager.createDatabase(database, logger);
   runPeriodically(
-    () => DatabaseManager.refreshLocations(db, ingestion, policy, logger),
+    () => DatabaseManager.refreshLocations(db, ingestionModel, policy, logger),
     10000,
   );
 
-  const entitiesCatalog = new DatabaseEntitiesCatalog(db, policy);
-  const locationsCatalog = new DatabaseLocationsCatalog(db, ingestion);
+  const entitiesCatalog = new DatabaseEntitiesCatalog(db);
+  const locationsCatalog = new DatabaseLocationsCatalog(db);
+  const higherOrderOperation = new HigherOrderOperations(
+    entitiesCatalog,
+    locationsCatalog,
+    ingestionModel,
+  );
 
-  return await createRouter({ entitiesCatalog, locationsCatalog, logger });
+  return await createRouter({
+    entitiesCatalog,
+    locationsCatalog,
+    higherOrderOperation,
+    logger,
+  });
 }

packages/catalog-model/src/index.ts

@@ -17,5 +17,6 @@
 export * from './entity';
 export { EntityPolicies } from './EntityPolicies';
 export * from './kinds';
+export * from './location';
 export type { EntityPolicy } from './types';
 export * from './validation';

packages/catalog-model/src/location/index.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export type { Location, LocationSpec } from './types';
+export { locationSchema, locationSpecSchema } from './validation';

packages/catalog-model/src/location/types.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export type LocationSpec = {
+  type: string;
+  target: string;
+};
+
+export type Location = {
+  id: string;
+} & LocationSpec;

packages/catalog-model/src/location/validation.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as yup from 'yup';
+import { LocationSpec, Location } from './types';
+
+export const locationSpecSchema = yup
+  .object<LocationSpec>({
+    type: yup.string().required(),
+    target: yup.string().required(),
+  })
+  .noUnknown();
+
+export const locationSchema = yup
+  .object<Location>({
+    id: yup.string().required(),
+    type: yup.string().required(),
+    target: yup.string().required(),
+  })
+  .noUnknown();