From 0f74ce87fb6bb70ba12ba5b4e75115c3dd7a3a5c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 6 Oct 2021 15:24:44 +0200
Subject: [PATCH] scaffolder: apply review fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Johan Haals <johan.haals@gmail.com>
Co-authored-by: Fredrik Adelöw <freben@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/processor/ScaffolderEntitiesProcessor.ts       |  1 +
 plugins/scaffolder-common/.eslintrc.js                 |  2 +-
 plugins/scaffolder-common/package.json                 |  4 ++--
 .../scaffolder-common/src/Template.v1beta3.schema.json | 10 +++++-----
 .../src/TemplateEntityV1beta3.test.ts                  |  4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/scaffolder-backend/src/processor/ScaffolderEntitiesProcessor.ts b/plugins/scaffolder-backend/src/processor/ScaffolderEntitiesProcessor.ts
index c69ba154f6..4f3c13f342 100644
--- a/plugins/scaffolder-backend/src/processor/ScaffolderEntitiesProcessor.ts
+++ b/plugins/scaffolder-backend/src/processor/ScaffolderEntitiesProcessor.ts
@@ -33,6 +33,7 @@ import {
   templateEntityV1beta3Schema,
 } from '@backstage/plugin-scaffolder-common';
 
+/** @public */
 export class ScaffolderEntitiesProcessor implements CatalogProcessor {
   private readonly validators = [
     entityKindSchemaValidator(templateEntityV1beta3Schema),
diff --git a/plugins/scaffolder-common/.eslintrc.js b/plugins/scaffolder-common/.eslintrc.js
index 16a033dbc6..13573efa9c 100644
--- a/plugins/scaffolder-common/.eslintrc.js
+++ b/plugins/scaffolder-common/.eslintrc.js
@@ -1,3 +1,3 @@
 module.exports = {
-  extends: [require.resolve('@backstage/cli/config/eslint.backend')],
+  extends: [require.resolve('@backstage/cli/config/eslint')],
 };
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index ad422fb149..27aa2594b2 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -5,6 +5,7 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
+  "private": false,
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
@@ -14,10 +15,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/backstage/backstage",
-    "directory": "plugin/scaffolder-common"
+    "directory": "plugins/scaffolder-common"
   },
   "keywords": [
-    "techdocs",
     "scaffolder"
   ],
   "files": [
diff --git a/plugins/scaffolder-common/src/Template.v1beta3.schema.json b/plugins/scaffolder-common/src/Template.v1beta3.schema.json
index 6992e82f02..e45bfb788d 100644
--- a/plugins/scaffolder-common/src/Template.v1beta3.schema.json
+++ b/plugins/scaffolder-common/src/Template.v1beta3.schema.json
@@ -83,6 +83,11 @@
               "examples": ["service", "website", "library"],
               "minLength": 1
             },
+            "owner": {
+              "type": "string",
+              "description": "The user (or group) owner of the template",
+              "minLength": 1
+            },
             "parameters": {
               "oneOf": [
                 {
@@ -172,11 +177,6 @@
               "additionalProperties": {
                 "type": "string"
               }
-            },
-            "owner": {
-              "type": "string",
-              "description": "The user (or group) owner of the template",
-              "minLength": 1
             }
           }
         }
diff --git a/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts b/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts
index 7863b7b476..ab5900ab32 100644
--- a/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts
+++ b/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts
@@ -32,8 +32,9 @@ describe('templateEntityV1beta3Validator', () => {
       },
       spec: {
         type: 'website',
+        owner: 'team-b',
         parameters: {
-          required: ['storePath', 'owner'],
+          required: ['owner'],
           properties: {
             owner: {
               type: 'string',
@@ -56,7 +57,6 @@ describe('templateEntityV1beta3Validator', () => {
         output: {
           fetchUrl: '${{ steps.fetch.output.targetUrl }}',
         },
-        owner: 'team-b@example.com',
       },
     };
   });