@backstage/plugin-scaffolder-backend 1.14.0 → 1.14.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.14.1-next.0
+
+### Patch Changes
+
+- cc936b529676: Fix handling of `optional` property in `catalog:register` scaffolder action
+- b269da39ac2d: Clearer error messages for action `publish:gitlab:merge-request`
+- Updated dependencies
+  - @backstage/catalog-client@1.4.2-next.0
+  - @backstage/plugin-catalog-backend@1.9.2-next.0
+  - @backstage/plugin-catalog-node@1.3.7-next.0
+  - @backstage/backend-common@0.18.6-next.0
+  - @backstage/integration@1.4.5
+  - @backstage/config@1.0.7
+  - @backstage/backend-plugin-api@0.5.3-next.0
+  - @backstage/backend-tasks@0.5.3-next.0
+  - @backstage/catalog-model@1.3.0
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.15-next.0
+  - @backstage/plugin-catalog-common@1.0.13
+  - @backstage/plugin-permission-common@0.7.5
+  - @backstage/plugin-permission-node@0.7.9-next.0
+  - @backstage/plugin-scaffolder-common@1.3.0
+  - @backstage/plugin-scaffolder-node@0.1.4-next.0
+
 ## 1.14.0
 
 ### Minor Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "1.14.0",
+  "version": "1.14.1-next.0",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var alpha = require('@backstage/plugin-catalog-node/alpha');
-var ScaffolderEntitiesProcessor = require('./cjs/ScaffolderEntitiesProcessor-021c5dcb.cjs.js');
+var ScaffolderEntitiesProcessor = require('./cjs/ScaffolderEntitiesProcessor-c40021d1.cjs.js');
 var alpha$1 = require('@backstage/plugin-scaffolder-common/alpha');
 var pluginPermissionNode = require('@backstage/plugin-permission-node');
 var backendCommon = require('@backstage/backend-common');

package/dist/cjs/{ScaffolderEntitiesProcessor-021c5dcb.cjs.js → ScaffolderEntitiesProcessor-c40021d1.cjs.js}

@@ -179,13 +179,19 @@ function createCatalogRegisterAction(options) {
         });
       }
       ctx.logger.info(`Registering ${catalogInfoUrl} in the catalog`);
-      await catalogClient.addLocation(
-        {
-          type: "url",
-          target: catalogInfoUrl
-        },
-        ((_a = ctx.secrets) == null ? void 0 : _a.backstageToken) ? { token: ctx.secrets.backstageToken } : {}
-      );
+      try {
+        await catalogClient.addLocation(
+          {
+            type: "url",
+            target: catalogInfoUrl
+          },
+          ((_a = ctx.secrets) == null ? void 0 : _a.backstageToken) ? { token: ctx.secrets.backstageToken } : {}
+        );
+      } catch (e) {
+        if (!input.optional) {
+          throw e;
+        }
+      }
       try {
         const result = await catalogClient.addLocation(
           {
@@ -195,7 +201,7 @@ function createCatalogRegisterAction(options) {
           },
           ((_b = ctx.secrets) == null ? void 0 : _b.backstageToken) ? { token: ctx.secrets.backstageToken } : {}
         );
-        if (result.entities.length > 0) {
+        if (result.entities.length) {
           const { entities } = result;
           let entity;
           entity = entities.find(
@@ -4250,13 +4256,15 @@ const createPublishGitlabMergeRequestAction = (options) => {
       try {
         await api.Branches.create(repoID, branchName, String(defaultBranch));
       } catch (e) {
-        throw new errors.InputError(`The branch creation failed ${e}`);
+        throw new errors.InputError(
+          `The branch creation failed. Please check that your repo does not already contain a branch named '${branchName}'. ${e}`
+        );
       }
       try {
         await api.Commits.create(repoID, branchName, ctx.input.title, actions);
       } catch (e) {
         throw new errors.InputError(
-          `Committing the changes to ${branchName} failed ${e}`
+          `Committing the changes to ${branchName} failed. Please check that none of the files created by the template already exists. ${e}`
         );
       }
       try {
@@ -6174,4 +6182,4 @@ exports.executeShellCommand = executeShellCommand;
 exports.fetchContents = fetchContents;
 exports.scaffolderActionRules = scaffolderActionRules;
 exports.scaffolderTemplateRules = scaffolderTemplateRules;
-//# sourceMappingURL=ScaffolderEntitiesProcessor-021c5dcb.cjs.js.map
+//# sourceMappingURL=ScaffolderEntitiesProcessor-c40021d1.cjs.js.map