Merge branch 'mob/union-types' of github.com:spotify/backstage into mob/union-types

* 'mob/union-types' of github.com:spotify/backstage: (34 commits)
  fix(yarn): fixup yarn.lock
  docs(catalog/grqphql): updating docs
  chore(gql/catalog): fixing some code review comments
  chore(gql/catalog): fixing dependencies
  chore: reverting code
  feat(gql/catalog): to remove the duplication in the schema thanks to the limitations on implements, let's create the schema using javascript
  feat(gql/catalog): working on making the schema nice
  feat(gql/catalog): Reduce the amount of duplication a little for unions
  chore(catalog/gql): fixing csp for playground
  chore(catalog/gql): move the catalog schema out of src
  chore(gql/catalog): updating the return types from the catalog api
  chore(gql/catalog): removing the mock data scripts for catalog-graph  l
  chore(gql/catalog): actually read
  chore(gql/catalog): fixing bundling of graphql asse
  chore(gql/catalog): removing the mock-data stuff
  feat(gql/catalog): implement the label resolver
  feat(gql/catalog): Fixing some of the query issues
  chore(gql/catalog): making the client alittle more readabke
  chore(gql/catalog): Added some more metadata fields to the catalog entities
  feat(gql/catlaog): Tidying up the resolver for the annotations
  ...

plugins/app-backend/src/run.ts

@@ -13,21 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { CatalogClient } from './client';
 
-import { getRootLogger } from '@backstage/backend-common';
-import yn from 'yn';
-import { startStandaloneServer } from './service/standaloneServer';
-
-const port = process.env.PLUGIN_PORT ? Number(process.env.PLUGIN_PORT) : 7000;
-const enableCors = yn(process.env.PLUGIN_CORS, { default: false });
-const logger = getRootLogger();
-
-startStandaloneServer({ port, enableCors, logger }).catch(err => {
-  logger.error(err);
-  process.exit(1);
-});
-
-process.on('SIGINT', () => {
-  logger.info('CTRL+C pressed; exiting.');
-  process.exit(0);
+describe('Catalog GraphQL Module', () => {
+  it('create a new client', () => {
+    void new CatalogClient('http://localhost:1234');
+    expect(true).toBe(true);
+  });
 });

plugins/catalog-graphql/codegen.yml

@@ -9,7 +9,7 @@ generates:
       afterOneFileWrite:
         - eslint --fix
     config:
-      contextType: '@graphql-modules/core#ModuleContext'
+      contextType: "@graphql-modules/core#ModuleContext"
       allowParentTypeOverride: true
       useIndexSignature: true
       defaultMapper: Partial<{T}>

plugins/catalog-graphql/src/graphql/module.ts

@@ -55,7 +55,6 @@ export async function createModule(
       },
     },
     CatalogEntity: {
-      // TODO - use symbols here instead of strings.
       metadata: entity => ({ ...entity.metadata!, entity }),
       spec: entity => ({ ...entity.spec!, entity }),
     },

plugins/catalog-graphql/src/schema.js

@@ -48,8 +48,12 @@ const EntityMetadata = /* GraphQL */ `
     # mock field to prove extensions working
     updatedBy: String
   }
+<<<<<<< HEAD
  
   # TODO: move this definition into plugin-scaffolder-graphql
+=======
+
+>>>>>>> 94d28cb5c81798c80b32bf4fa8d834cb873ec06a
   type TemplateEntitySpec {
     type: String!
     path: String