@backstage/plugin-catalog-backend 1.17.0-next.0 → 1.17.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # @backstage/plugin-catalog-backend
 
+## 1.17.0-next.2
+
+### Patch Changes
+
+- 9aac2b0: Use `--cwd` as the first `yarn` argument
+- Updated dependencies
+  - @backstage/repo-tools@0.6.0-next.2
+  - @backstage/backend-common@0.21.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.14-next.2
+  - @backstage/backend-plugin-api@0.6.10-next.2
+  - @backstage/backend-tasks@0.5.15-next.2
+  - @backstage/plugin-auth-node@0.4.4-next.2
+  - @backstage/plugin-permission-node@0.7.21-next.2
+  - @backstage/backend-openapi-utils@0.1.3-next.2
+  - @backstage/plugin-catalog-node@1.6.2-next.2
+  - @backstage/plugin-events-node@0.2.19-next.2
+  - @backstage/config@1.1.1
+  - @backstage/catalog-client@1.6.0-next.1
+  - @backstage/catalog-model@1.4.4-next.0
+  - @backstage/errors@1.2.3
+  - @backstage/integration@1.9.0-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.21-next.0
+  - @backstage/plugin-permission-common@0.7.12
+
+## 1.17.0-next.1
+
+### Minor Changes
+
+- 43dad25: Add API to get location by entity
+
+### Patch Changes
+
+- 89b674c: Minor performance improvement for `queryEntities` when the limit is 0.
+- efa8160: Rollback the change for wildcard discovery, this fixes a bug with the `AzureUrlReader` not working with wildcard paths
+- Updated dependencies
+  - @backstage/catalog-model@1.4.4-next.0
+  - @backstage/catalog-client@1.6.0-next.1
+  - @backstage/backend-plugin-api@0.6.10-next.1
+  - @backstage/backend-common@0.21.0-next.1
+  - @backstage/integration@1.9.0-next.0
+  - @backstage/backend-openapi-utils@0.1.3-next.1
+  - @backstage/backend-tasks@0.5.15-next.1
+  - @backstage/config@1.1.1
+  - @backstage/errors@1.2.3
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.21-next.0
+  - @backstage/plugin-catalog-node@1.6.2-next.1
+  - @backstage/plugin-events-node@0.2.19-next.1
+  - @backstage/plugin-permission-common@0.7.12
+  - @backstage/plugin-permission-node@0.7.21-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.14-next.1
+
 ## 1.17.0-next.0
 
 ### Minor Changes

package/README.md

@@ -27,7 +27,7 @@ restoring the plugin, if you previously removed it.
 
 ```bash
 # From your Backstage root directory
-yarn add --cwd packages/backend @backstage/plugin-catalog-backend
+yarn --cwd packages/backend add @backstage/plugin-catalog-backend
 ```
 
 ### Adding the plugin to your `packages/backend`

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.17.0-next.0",
+  "version": "1.17.0-next.2",
   "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 alpha = require('@backstage/plugin-catalog-common/alpha');
 var pluginPermissionNode = require('@backstage/plugin-permission-node');
-var CatalogBuilder = require('./cjs/CatalogBuilder-5a2a16bf.cjs.js');
+var CatalogBuilder = require('./cjs/CatalogBuilder-2dd9e66c.cjs.js');
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var alpha$1 = require('@backstage/plugin-catalog-node/alpha');
 var backendCommon = require('@backstage/backend-common');

package/dist/cjs/{CatalogBuilder-5a2a16bf.cjs.js → CatalogBuilder-2dd9e66c.cjs.js}

@@ -668,7 +668,7 @@ class UrlReaderProcessor {
     return true;
   }
   async doRead(location, etag) {
-    const { pathname: filepath } = new URL(location);
+    const { filepath } = parseGitUrl__default["default"](location);
     if (filepath == null ? void 0 : filepath.match(/[*?]/)) {
       const limiter = limiterFactory__default["default"](5);
       const response = await this.options.reader.search(location, { etag });
@@ -947,6 +947,30 @@ class DefaultLocationStore {
       removed: [{ entity, locationKey: getEntityLocationRef(entity) }]
     });
   }
+  async getLocationByEntity(entityRef) {
+    const entityRefString = catalogModel.stringifyEntityRef(entityRef);
+    const [entity] = await this.db("refresh_state").where({ entity_ref: entityRefString }).select("entity_id").limit(1);
+    if (!entity) {
+      throw new errors.NotFoundError(`found no entity for ref ${entityRefString}`);
+    }
+    const [locationKeyValue] = await this.db("search").where({
+      entity_id: entity.entity_id,
+      key: `metadata.annotations.${catalogModel.ANNOTATION_ORIGIN_LOCATION}`
+    }).select("value").limit(1);
+    if (!locationKeyValue) {
+      throw new errors.NotFoundError(
+        `found no origin annotation for ref ${entityRefString}`
+      );
+    }
+    const { type, target } = catalogModel.parseLocationRef(entityRefString);
+    const [location] = await this.db("locations").where({ type, target }).select().limit(1);
+    if (!location) {
+      throw new errors.NotFoundError(
+        `Found no location with type ${type} and target ${target}`
+      );
+    }
+    return location;
+  }
   get connection() {
     if (!this._connection) {
       throw new Error("location store is not initialized");
@@ -2133,6 +2157,9 @@ class DefaultLocationService {
   deleteLocation(id) {
     return this.store.deleteLocation(id);
   }
+  getLocationByEntity(entityRef) {
+    return this.store.getLocationByEntity(catalogModel.parseEntityRef(entityRef));
+  }
   async processEntities(unprocessedEntities) {
     const entities = [];
     while (unprocessedEntities.length) {
@@ -2559,7 +2586,7 @@ class DefaultEntitiesCatalog {
     ]).limit(isFetchingBackwards ? limit : limit + 1);
     countQuery.count("search.entity_id", { as: "count" });
     const [rows, [{ count }]] = await Promise.all([
-      dbQuery,
+      limit > 0 ? dbQuery : [],
       // for performance reasons we invoke the countQuery
       // only on the first request.
       // The result is then embedded into the cursor
@@ -5271,6 +5298,62 @@ const spec = {
         ]
       }
     },
+    "/locations/by-entity/{kind}/{namespace}/{name}": {
+      get: {
+        operationId: "getLocationByEntity",
+        description: "Get a location for entity.",
+        responses: {
+          "200": {
+            description: "Ok",
+            content: {
+              "application/json": {
+                schema: {
+                  $ref: "#/components/schemas/Location"
+                }
+              }
+            }
+          },
+          default: {
+            $ref: "#/components/responses/ErrorResponse"
+          }
+        },
+        security: [
+          {},
+          {
+            JWT: []
+          }
+        ],
+        parameters: [
+          {
+            in: "path",
+            name: "kind",
+            required: true,
+            allowReserved: true,
+            schema: {
+              type: "string"
+            }
+          },
+          {
+            in: "path",
+            name: "namespace",
+            required: true,
+            allowReserved: true,
+            schema: {
+              type: "string"
+            }
+          },
+          {
+            in: "path",
+            name: "name",
+            required: true,
+            allowReserved: true,
+            schema: {
+              type: "string"
+            }
+          }
+        ]
+      }
+    },
     "/analyze-location": {
       post: {
         operationId: "AnalyzeLocation",
@@ -5598,6 +5681,17 @@ async function createRouter(options) {
         )
       });
       res.status(204).end();
+    }).get("/locations/by-entity/:kind/:namespace/:name", async (req, res) => {
+      const { kind, namespace, name } = req.params;
+      const output = await locationService.getLocationByEntity(
+        { kind, namespace, name },
+        {
+          authorizationToken: pluginAuthNode.getBearerTokenFromAuthorizationHeader(
+            req.header("authorization")
+          )
+        }
+      );
+      res.status(200).json(output);
     });
   }
   if (locationAnalyzer) {
@@ -6319,6 +6413,16 @@ class AuthorizedLocationService {
     }
     return this.locationService.deleteLocation(id);
   }
+  async getLocationByEntity(entityRef, options) {
+    const authorizationResponse = (await this.permissionApi.authorize(
+      [{ permission: alpha.catalogLocationReadPermission }],
+      { token: options == null ? void 0 : options.authorizationToken }
+    ))[0];
+    if (authorizationResponse.result === pluginPermissionCommon.AuthorizeResult.DENY) {
+      throw new errors.NotFoundError();
+    }
+    return this.locationService.getLocationByEntity(entityRef);
+  }
 }
 
 async function deleteWithEagerPruningOfChildren(options) {
@@ -7253,4 +7357,4 @@ exports.createCatalogPermissionRule = createCatalogPermissionRule;
 exports.createRandomProcessingInterval = createRandomProcessingInterval;
 exports.parseEntityYaml = parseEntityYaml;
 exports.permissionRules = permissionRules;
-//# sourceMappingURL=CatalogBuilder-5a2a16bf.cjs.js.map
+//# sourceMappingURL=CatalogBuilder-2dd9e66c.cjs.js.map