From 0ce506ac43684de588c5dc823d4f40ebc1c8d097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 28 May 2020 16:36:52 +0200
Subject: [PATCH] Less watching, less foreign root fields

---
 packages/backend/package.json                             | 5 +----
 packages/catalog-model/src/EntityPolicies.ts              | 4 ++--
 ...cy.test.ts => NoForeignRootFieldsEntityPolicy.test.ts} | 8 ++++----
 ...EntityPolicy.ts => NoForeignRootFieldsEntityPolicy.ts} | 2 +-
 packages/catalog-model/src/entity/policies/index.ts       | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)
 rename packages/catalog-model/src/entity/policies/{ForeignRootFieldsEntityPolicy.test.ts => NoForeignRootFieldsEntityPolicy.test.ts} (85%)
 rename packages/catalog-model/src/entity/policies/{ForeignRootFieldsEntityPolicy.ts => NoForeignRootFieldsEntityPolicy.ts} (94%)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 51fe04e51d..e4b77c1e41 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -45,9 +45,6 @@
     "typescript": "^3.9.2"
   },
   "nodemonConfig": {
-    "watch": [
-      "./dist",
-      "node_modules/@backstage*"
-    ]
+    "watch": "./dist"
   }
 }
diff --git a/packages/catalog-model/src/EntityPolicies.ts b/packages/catalog-model/src/EntityPolicies.ts
index cedf0df13d..abc953ab6f 100644
--- a/packages/catalog-model/src/EntityPolicies.ts
+++ b/packages/catalog-model/src/EntityPolicies.ts
@@ -17,7 +17,7 @@
 import {
   Entity,
   FieldFormatEntityPolicy,
-  ForeignRootFieldsEntityPolicy,
+  NoForeignRootFieldsEntityPolicy,
   ReservedFieldsEntityPolicy,
   SchemaValidEntityPolicy,
 } from './entity';
@@ -62,7 +62,7 @@ export class EntityPolicies implements EntityPolicy {
     return EntityPolicies.allOf([
       EntityPolicies.allOf([
         new SchemaValidEntityPolicy(),
-        new ForeignRootFieldsEntityPolicy(),
+        new NoForeignRootFieldsEntityPolicy(),
         new FieldFormatEntityPolicy(),
         new ReservedFieldsEntityPolicy(),
       ]),
diff --git a/packages/catalog-model/src/entity/policies/ForeignRootFieldsEntityPolicy.test.ts b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.test.ts
similarity index 85%
rename from packages/catalog-model/src/entity/policies/ForeignRootFieldsEntityPolicy.test.ts
rename to packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.test.ts
index 98299259f8..190024bb29 100644
--- a/packages/catalog-model/src/entity/policies/ForeignRootFieldsEntityPolicy.test.ts
+++ b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.test.ts
@@ -15,11 +15,11 @@
  */
 
 import yaml from 'yaml';
-import { ForeignRootFieldsEntityPolicy } from './ForeignRootFieldsEntityPolicy';
+import { NoForeignRootFieldsEntityPolicy } from './NoForeignRootFieldsEntityPolicy';
 
-describe('ForeignRootFieldsEntityPolicy', () => {
+describe('NoForeignRootFieldsEntityPolicy', () => {
   let data: any;
-  let policy: ForeignRootFieldsEntityPolicy;
+  let policy: NoForeignRootFieldsEntityPolicy;
 
   beforeEach(() => {
     data = yaml.parse(`
@@ -38,7 +38,7 @@ describe('ForeignRootFieldsEntityPolicy', () => {
       spec:
         custom: stuff
     `);
-    policy = new ForeignRootFieldsEntityPolicy();
+    policy = new NoForeignRootFieldsEntityPolicy();
   });
 
   it('works for the happy path', async () => {
diff --git a/packages/catalog-model/src/entity/policies/ForeignRootFieldsEntityPolicy.ts b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
similarity index 94%
rename from packages/catalog-model/src/entity/policies/ForeignRootFieldsEntityPolicy.ts
rename to packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
index a4733e9a42..3c0a2f5d61 100644
--- a/packages/catalog-model/src/entity/policies/ForeignRootFieldsEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
@@ -22,7 +22,7 @@ const defaultKnownFields = ['apiVersion', 'kind', 'metadata', 'spec'];
 /**
  * Ensures that there are no foreign root fields in the entity.
  */
-export class ForeignRootFieldsEntityPolicy implements EntityPolicy {
+export class NoForeignRootFieldsEntityPolicy implements EntityPolicy {
   private readonly knownFields: string[];
 
   constructor(knownFields: string[] = defaultKnownFields) {
diff --git a/packages/catalog-model/src/entity/policies/index.ts b/packages/catalog-model/src/entity/policies/index.ts
index f43aa68049..d64053f7cb 100644
--- a/packages/catalog-model/src/entity/policies/index.ts
+++ b/packages/catalog-model/src/entity/policies/index.ts
@@ -15,6 +15,6 @@
  */
 
 export { FieldFormatEntityPolicy } from './FieldFormatEntityPolicy';
-export { ForeignRootFieldsEntityPolicy } from './ForeignRootFieldsEntityPolicy';
+export { NoForeignRootFieldsEntityPolicy } from './NoForeignRootFieldsEntityPolicy';
 export { ReservedFieldsEntityPolicy } from './ReservedFieldsEntityPolicy';
 export { SchemaValidEntityPolicy } from './SchemaValidEntityPolicy';