From 461571816729919eba2d9d7cdaaf0e75f4ad1e16 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 16 Jun 2020 14:40:43 +0200 Subject: [PATCH] feat(catalog): added the ability to load mock data into the catalog from the scaffolder too --- docs/getting-started/README.md | 2 +- packages/backend/README.md | 2 +- plugins/catalog-backend/README.md | 2 +- plugins/catalog-backend/package.json | 2 +- plugins/scaffolder-backend/package.json | 3 ++- .../react-ssr-template/template-info.json | 6 ------ .../sample-templates/react-ssr-template/template.yml | 10 ++++++++++ plugins/scaffolder-backend/scripts/mock-data | 8 ++++++++ 8 files changed, 24 insertions(+), 11 deletions(-) delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/template-info.json create mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yml create mode 100644 plugins/scaffolder-backend/scripts/mock-data diff --git a/docs/getting-started/README.md b/docs/getting-started/README.md index 32830c9bb3..5e404d4cb6 100644 --- a/docs/getting-started/README.md +++ b/docs/getting-started/README.md @@ -38,7 +38,7 @@ to look at, and then launch the frontend. These commands are run from the project root, not inside the backend directory. ```bash -yarn lerna run mock-catalog-data +yarn lerna run mock-data yarn start ``` diff --git a/packages/backend/README.md b/packages/backend/README.md index 64078006e7..cd71b50fb0 100644 --- a/packages/backend/README.md +++ b/packages/backend/README.md @@ -43,7 +43,7 @@ To get started, you can issue the following after starting the backend, from ins the `plugins/catalog-backend` directory: ```bash -yarn mock-catalog-data +yarn mock-data ``` You should then start seeing data on `localhost:7000/catalog/entities`. diff --git a/plugins/catalog-backend/README.md b/plugins/catalog-backend/README.md index 2d6b365f90..246cd83d56 100644 --- a/plugins/catalog-backend/README.md +++ b/plugins/catalog-backend/README.md @@ -23,7 +23,7 @@ cd packages/backend yarn start # open another terminal window, and run the following from the very root of the Backstage project -yarn lerna run mock-catalog-data +yarn lerna run mock-data ``` This will launch the full example backend and populate its catalog with some mock entities. diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index 9abfb1646a..e8b43de86a 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -13,7 +13,7 @@ "prepack": "backstage-cli prepack", "postpack": "backstage-cli postpack", "clean": "backstage-cli clean", - "mock-catalog-data": "./scripts/mock-data" + "mock-data": "./scripts/mock-data" }, "dependencies": { "@backstage/backend-common": "^0.1.1-alpha.8", diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index da87c707aa..2408471229 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -11,7 +11,8 @@ "test": "backstage-cli test", "prepack": "backstage-cli prepack", "postpack": "backstage-cli postpack", - "clean": "backstage-cli clean" + "clean": "backstage-cli clean", + "mock-data": "./scripts/mock-data" }, "dependencies": { "@backstage/backend-common": "^0.1.1-alpha.8", diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template-info.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template-info.json deleted file mode 100644 index 0a03fd95d6..0000000000 --- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template-info.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "id": "react-ssr-template", - "name": "SSR React Website", - "description": "Next.js application skeleton for creating isomorphic web applications.", - "ownerId": "something" -} diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yml new file mode 100644 index 0000000000..17f9ebbf7d --- /dev/null +++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yml @@ -0,0 +1,10 @@ +apiVersion: backstage.io/v1alpha1 +kind: Template +metadata: + name: react-ssr-template + title: React SSR Template + description: Next.js application skeleton for creating isomorphic web applications. +spec: + type: cookiecutter + path: '.' + diff --git a/plugins/scaffolder-backend/scripts/mock-data b/plugins/scaffolder-backend/scripts/mock-data new file mode 100644 index 0000000000..e457e32b7b --- /dev/null +++ b/plugins/scaffolder-backend/scripts/mock-data @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +curl \ +--location \ +--request POST 'localhost:7000/catalog/locations' \ +--header 'Content-Type: application/json' \ +--data-raw "{\"type\": \"github\", \"target\": \"https://github.com/spotify/backstage/blob/mob/move-templates-into-service-catalog/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yml\"}" +