@backstage/plugin-catalog-backend 2.0.1-next.1 → 2.0.1-next.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @backstage/plugin-catalog-backend
 
+## 2.0.1-next.2
+
+### Patch Changes
+
+- 2cac8b0: You can now specify an optional value when applying the `HAS_LABEL` permission rule, similar to the `HAS_ANNOTATION` permission rule.
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.5.4-next.1
+  - @backstage/backend-plugin-api@1.4.0-next.1
+  - @backstage/catalog-client@1.10.1-next.0
+  - @backstage/catalog-model@1.7.4
+  - @backstage/config@1.3.2
+  - @backstage/errors@1.2.7
+  - @backstage/integration@1.17.0
+  - @backstage/types@1.2.1
+  - @backstage/plugin-catalog-common@1.1.4
+  - @backstage/plugin-catalog-node@1.17.1-next.1
+  - @backstage/plugin-events-node@0.4.12-next.1
+  - @backstage/plugin-permission-common@0.9.0
+  - @backstage/plugin-permission-node@0.10.1-next.1
+
 ## 2.0.1-next.1
 
 ### Patch Changes

package/dist/alpha.d.ts

@@ -20,6 +20,7 @@ declare const catalogConditions: _backstage_plugin_permission_node.Conditions<{
     }>;
     hasLabel: _backstage_plugin_permission_node.PermissionRule<_backstage_catalog_model.Entity, _backstage_plugin_catalog_node.EntitiesSearchFilter, "catalog-entity", {
         label: string;
+        value?: string | undefined;
     }>;
     hasMetadata: _backstage_plugin_permission_node.PermissionRule<_backstage_catalog_model.Entity, _backstage_plugin_catalog_node.EntitiesSearchFilter, "catalog-entity", {
         key: string;
@@ -99,6 +100,7 @@ declare const permissionRules: {
     }>;
     hasLabel: _backstage_plugin_permission_node.PermissionRule<_backstage_catalog_model.Entity, _backstage_plugin_catalog_node.EntitiesSearchFilter, "catalog-entity", {
         label: string;
+        value?: string | undefined;
     }>;
     hasMetadata: _backstage_plugin_permission_node.PermissionRule<_backstage_catalog_model.Entity, _backstage_plugin_catalog_node.EntitiesSearchFilter, "catalog-entity", {
         key: string;

package/dist/permissions/rules/hasLabel.cjs.js

@@ -9,12 +9,16 @@ const hasLabel = pluginPermissionNode.createPermissionRule({
   description: "Allow entities with the specified label",
   resourceRef: alpha.catalogEntityPermissionResourceRef,
   paramsSchema: zod.z.object({
-    label: zod.z.string().describe("Name of the label to match on")
+    label: zod.z.string().describe("Name of the label to match on"),
+    value: zod.z.string().optional().describe("Value of the label to match on")
   }),
-  apply: (resource, { label }) => !!resource.metadata.labels?.hasOwnProperty(label),
-  toQuery: ({ label }) => ({
+  apply: (resource, { label, value }) => !!resource.metadata.labels?.hasOwnProperty(label) && (value === void 0 ? true : resource.metadata.labels?.[label] === value),
+  toQuery: ({ label, value }) => value === void 0 ? {
     key: `metadata.labels.${label}`
-  })
+  } : {
+    key: `metadata.labels.${label}`,
+    values: [value]
+  }
 });
 
 exports.hasLabel = hasLabel;

package/dist/permissions/rules/hasLabel.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"hasLabel.cjs.js","sources":["../../../src/permissions/rules/hasLabel.ts"],"sourcesContent":["/*\n * Copyright 2022 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { catalogEntityPermissionResourceRef } from '@backstage/plugin-catalog-node/alpha';\nimport { createPermissionRule } from '@backstage/plugin-permission-node';\nimport { z } from 'zod';\n\n/**\n * A catalog {@link @backstage/plugin-permission-node#PermissionRule} which\n * filters for entities with a specified label in its metadata.\n * @alpha\n */\nexport const hasLabel = createPermissionRule({\n  name: 'HAS_LABEL',\n  description: 'Allow entities with the specified label',\n  resourceRef: catalogEntityPermissionResourceRef,\n  paramsSchema: z.object({\n    label: z.string().describe('Name of the label to match on'),\n  }),\n  apply: (resource, { label }) =>\n    !!resource.metadata.labels?.hasOwnProperty(label),\n  toQuery: ({ label }) => ({\n    key: `metadata.labels.${label}`,\n  }),\n});\n"],"names":["createPermissionRule","catalogEntityPermissionResourceRef","z"],"mappings":";;;;;;AAyBO,MAAM,WAAWA,yCAAqB,CAAA;AAAA,EAC3C,IAAM,EAAA,WAAA;AAAA,EACN,WAAa,EAAA,yCAAA;AAAA,EACb,WAAa,EAAAC,wCAAA;AAAA,EACb,YAAA,EAAcC,MAAE,MAAO,CAAA;AAAA,IACrB,KAAO,EAAAA,KAAA,CAAE,MAAO,EAAA,CAAE,SAAS,+BAA+B;AAAA,GAC3D,CAAA;AAAA,EACD,KAAO,EAAA,CAAC,QAAU,EAAA,EAAE,KAAM,EAAA,KACxB,CAAC,CAAC,QAAS,CAAA,QAAA,CAAS,MAAQ,EAAA,cAAA,CAAe,KAAK,CAAA;AAAA,EAClD,OAAS,EAAA,CAAC,EAAE,KAAA,EAAa,MAAA;AAAA,IACvB,GAAA,EAAK,mBAAmB,KAAK,CAAA;AAAA,GAC/B;AACF,CAAC;;;;"}
+{"version":3,"file":"hasLabel.cjs.js","sources":["../../../src/permissions/rules/hasLabel.ts"],"sourcesContent":["/*\n * Copyright 2022 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { catalogEntityPermissionResourceRef } from '@backstage/plugin-catalog-node/alpha';\nimport { createPermissionRule } from '@backstage/plugin-permission-node';\nimport { z } from 'zod';\n\n/**\n * A catalog {@link @backstage/plugin-permission-node#PermissionRule} which\n * filters for entities with a specified label in its metadata.\n * @alpha\n */\nexport const hasLabel = createPermissionRule({\n  name: 'HAS_LABEL',\n  description: 'Allow entities with the specified label',\n  resourceRef: catalogEntityPermissionResourceRef,\n  paramsSchema: z.object({\n    label: z.string().describe('Name of the label to match on'),\n    value: z.string().optional().describe('Value of the label to match on'),\n  }),\n  apply: (resource, { label, value }) =>\n    !!resource.metadata.labels?.hasOwnProperty(label) &&\n    (value === undefined ? true : resource.metadata.labels?.[label] === value),\n  toQuery: ({ label, value }) =>\n    value === undefined\n      ? {\n          key: `metadata.labels.${label}`,\n        }\n      : {\n          key: `metadata.labels.${label}`,\n          values: [value],\n        },\n});\n"],"names":["createPermissionRule","catalogEntityPermissionResourceRef","z"],"mappings":";;;;;;AAyBO,MAAM,WAAWA,yCAAqB,CAAA;AAAA,EAC3C,IAAM,EAAA,WAAA;AAAA,EACN,WAAa,EAAA,yCAAA;AAAA,EACb,WAAa,EAAAC,wCAAA;AAAA,EACb,YAAA,EAAcC,MAAE,MAAO,CAAA;AAAA,IACrB,KAAO,EAAAA,KAAA,CAAE,MAAO,EAAA,CAAE,SAAS,+BAA+B,CAAA;AAAA,IAC1D,OAAOA,KAAE,CAAA,MAAA,GAAS,QAAS,EAAA,CAAE,SAAS,gCAAgC;AAAA,GACvE,CAAA;AAAA,EACD,KAAA,EAAO,CAAC,QAAU,EAAA,EAAE,OAAO,KAAM,EAAA,KAC/B,CAAC,CAAC,QAAS,CAAA,QAAA,CAAS,QAAQ,cAAe,CAAA,KAAK,MAC/C,KAAU,KAAA,KAAA,CAAA,GAAY,OAAO,QAAS,CAAA,QAAA,CAAS,MAAS,GAAA,KAAK,CAAM,KAAA,KAAA,CAAA;AAAA,EACtE,SAAS,CAAC,EAAE,OAAO,KAAM,EAAA,KACvB,UAAU,KACN,CAAA,GAAA;AAAA,IACE,GAAA,EAAK,mBAAmB,KAAK,CAAA;AAAA,GAE/B,GAAA;AAAA,IACE,GAAA,EAAK,mBAAmB,KAAK,CAAA,CAAA;AAAA,IAC7B,MAAA,EAAQ,CAAC,KAAK;AAAA;AAExB,CAAC;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "2.0.1-next.1",
+  "version": "2.0.1-next.2",
   "description": "The Backstage backend plugin that provides the Backstage catalog",
   "backstage": {
     "role": "backend-plugin",
@@ -106,11 +106,11 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/backend-defaults": "0.10.1-next.1",
-    "@backstage/backend-test-utils": "1.6.0-next.1",
-    "@backstage/cli": "0.32.2-next.0",
+    "@backstage/backend-defaults": "0.11.0-next.2",
+    "@backstage/backend-test-utils": "1.6.0-next.2",
+    "@backstage/cli": "0.33.0-next.1",
     "@backstage/plugin-permission-common": "0.9.0",
-    "@backstage/repo-tools": "0.14.0-next.1",
+    "@backstage/repo-tools": "0.14.0-next.2",
     "@backstage/test-utils": "1.7.8",
     "@types/core-js": "^2.5.4",
     "@types/express": "^4.17.6",