@backstage/plugin-catalog-backend-module-puppetdb 0.2.22-next.0 → 0.2.22-next.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog-backend-module-puppetdb
 
+## 0.2.22-next.1
+
+### Patch Changes
+
+- e9b78e9: Removed the `uuid` dependency and replaced usage with the built-in `crypto.randomUUID()`.
+- Updated dependencies
+  - @backstage/catalog-model@1.8.1-next.1
+  - @backstage/plugin-catalog-node@2.2.1-next.1
+
 ## 0.2.22-next.0
 
 ### Patch Changes

package/dist/providers/PuppetDbEntityProvider.cjs.js

@@ -1,33 +1,13 @@
 'use strict';
 
 var PuppetDbEntityProviderConfig = require('./PuppetDbEntityProviderConfig.cjs.js');
-var uuid = require('uuid');
+var node_crypto = require('node:crypto');
 var constants = require('../puppet/constants.cjs.js');
 var transformers = require('../puppet/transformers.cjs.js');
 var catalogModel = require('@backstage/catalog-model');
 var lodash = require('lodash');
 var read = require('../puppet/read.cjs.js');
 
-function _interopNamespaceCompat(e) {
-  if (e && typeof e === 'object' && 'default' in e) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var uuid__namespace = /*#__PURE__*/_interopNamespaceCompat(uuid);
-
 class PuppetDbEntityProvider {
   config;
   logger;
@@ -102,7 +82,7 @@ class PuppetDbEntityProvider {
           const logger = this.logger.child({
             class: PuppetDbEntityProvider.prototype.constructor.name,
             taskId,
-            taskInstanceId: uuid__namespace.v4()
+            taskInstanceId: node_crypto.randomUUID()
           });
           try {
             await this.refresh(logger);

package/dist/providers/PuppetDbEntityProvider.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"PuppetDbEntityProvider.cjs.js","sources":["../../src/providers/PuppetDbEntityProvider.ts"],"sourcesContent":["/*\n * Copyright 2021 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 {\n  EntityProvider,\n  EntityProviderConnection,\n} from '@backstage/plugin-catalog-node';\nimport {\n  PuppetDbEntityProviderConfig,\n  readProviderConfigs,\n} from './PuppetDbEntityProviderConfig';\nimport { Config } from '@backstage/config';\nimport * as uuid from 'uuid';\nimport { defaultResourceTransformer, ResourceTransformer } from '../puppet';\nimport {\n  ANNOTATION_LOCATION,\n  ANNOTATION_ORIGIN_LOCATION,\n  Entity,\n} from '@backstage/catalog-model';\nimport { merge } from 'lodash';\nimport { readPuppetNodes } from '../puppet/read';\nimport { ENDPOINT_NODES } from '../puppet/constants';\nimport {\n  SchedulerService,\n  SchedulerServiceTaskRunner,\n  LoggerService,\n} from '@backstage/backend-plugin-api';\n\n/**\n * Reads nodes from [PuppetDB](https://www.puppet.com/docs/puppet/6/puppetdb_overview.html)\n * based on the provided query and registers them as Resource entities in the catalog.\n *\n * @public\n */\nexport class PuppetDbEntityProvider implements EntityProvider {\n  private readonly config: PuppetDbEntityProviderConfig;\n  private readonly logger: LoggerService;\n  private readonly scheduleFn: () => Promise<void>;\n  private readonly transformer: ResourceTransformer;\n  private connection?: EntityProviderConnection;\n\n  /**\n   * Creates instances of {@link PuppetDbEntityProvider} from a configuration.\n   *\n   * @param config - The configuration to read provider information from.\n   * @param deps - The dependencies for  {@link PuppetDbEntityProvider}.\n   *\n   * @returns A list of {@link PuppetDbEntityProvider} instances.\n   */\n  static fromConfig(\n    config: Config,\n    deps: {\n      logger: LoggerService;\n      schedule?: SchedulerServiceTaskRunner;\n      scheduler?: SchedulerService;\n      transformer?: ResourceTransformer;\n    },\n  ): PuppetDbEntityProvider[] {\n    if (!deps.schedule && !deps.scheduler) {\n      throw new Error('Either schedule or scheduler must be provided.');\n    }\n\n    return readProviderConfigs(config).map(providerConfig => {\n      if (!deps.schedule && !providerConfig.schedule) {\n        throw new Error(\n          `No schedule provided neither via code nor config for puppet-provider:${providerConfig.id}.`,\n        );\n      }\n\n      const taskRunner =\n        deps.schedule ??\n        deps.scheduler!.createScheduledTaskRunner(providerConfig.schedule!);\n\n      const transformer = deps.transformer ?? defaultResourceTransformer;\n\n      return new PuppetDbEntityProvider(\n        providerConfig,\n        deps.logger,\n        taskRunner,\n        transformer,\n      );\n    });\n  }\n\n  /**\n   * Creates an instance of {@link PuppetDbEntityProvider}.\n   *\n   * @param config - Configuration of the provider.\n   * @param logger - The instance of a {@link @backstage/backend-plugin-api#LoggerService}.\n   * @param taskRunner - The instance of {@link @backstage/backend-plugin-api#SchedulerServiceTaskRunner}.\n   * @param transformer - A {@link ResourceTransformer} function.\n   *\n   */\n  private constructor(\n    config: PuppetDbEntityProviderConfig,\n    logger: LoggerService,\n    taskRunner: SchedulerServiceTaskRunner,\n    transformer: ResourceTransformer,\n  ) {\n    this.config = config;\n    this.logger = logger.child({\n      target: this.getProviderName(),\n    });\n    this.scheduleFn = this.createScheduleFn(taskRunner);\n    this.transformer = transformer;\n  }\n\n  /** {@inheritdoc @backstage/plugin-catalog-node#EntityProvider.connect} */\n  async connect(connection: EntityProviderConnection): Promise<void> {\n    this.connection = connection;\n    await this.scheduleFn();\n  }\n\n  /** {@inheritdoc @backstage/plugin-catalog-node#EntityProvider.getProviderName} */\n  getProviderName(): string {\n    return `puppetdb-provider:${this.config.id}`;\n  }\n\n  /**\n   * Creates a function that can be used to schedule a refresh of the catalog.\n   *\n   * @param taskRunner - The instance of {@link @backstage/backend-plugin-api#SchedulerServiceTaskRunner}.\n   */\n  private createScheduleFn(\n    taskRunner: SchedulerServiceTaskRunner,\n  ): () => Promise<void> {\n    return async () => {\n      const taskId = `${this.getProviderName()}:refresh`;\n      return taskRunner.run({\n        id: taskId,\n        fn: async () => {\n          const logger = this.logger.child({\n            class: PuppetDbEntityProvider.prototype.constructor.name,\n            taskId,\n            taskInstanceId: uuid.v4(),\n          });\n          try {\n            await this.refresh(logger);\n          } catch (error) {\n            logger.error(\n              `${this.getProviderName()} refresh failed, ${error}`,\n              error,\n            );\n          }\n        },\n      });\n    };\n  }\n\n  /**\n   * Refreshes the catalog by reading nodes from PuppetDB and registering them as Resource Entities.\n   *\n   * @param logger - The instance of a Logger.\n   */\n  async refresh(logger: LoggerService) {\n    if (!this.connection) {\n      throw new Error('Not initialized');\n    }\n\n    const { markReadComplete } = trackProgress(logger);\n    const entities = await readPuppetNodes(this.config, {\n      logger,\n      transformer: this.transformer,\n    });\n    const { markCommitComplete } = markReadComplete(entities);\n\n    await this.connection.applyMutation({\n      type: 'full',\n      entities: [...entities].map(entity => ({\n        locationKey: this.getProviderName(),\n        entity: withLocations(this.config.baseUrl, entity),\n      })),\n    });\n    markCommitComplete(entities);\n  }\n}\n\n/**\n * Ensures the entities have required annotation data.\n *\n * @param baseUrl - The base URL of the PuppetDB instance.\n * @param entity - The entity to add the annotations to.\n *\n * @returns Entity with @{@link ANNOTATION_LOCATION} and @{@link ANNOTATION_ORIGIN_LOCATION} annotations.\n */\nfunction withLocations(baseUrl: string, entity: Entity): Entity {\n  const location = `${baseUrl}/${ENDPOINT_NODES}/${entity.metadata?.name}`;\n\n  return merge(\n    {\n      metadata: {\n        annotations: {\n          [ANNOTATION_LOCATION]: `url:${location}`,\n          [ANNOTATION_ORIGIN_LOCATION]: `url:${location}`,\n        },\n      },\n    },\n    entity,\n  ) as Entity;\n}\n\n/**\n * Tracks the progress of the PuppetDB read and commit operations.\n *\n * @param logger - The instance of a {@link @backstage/backend-plugin-api#LoggerService}.\n */\nfunction trackProgress(logger: LoggerService) {\n  let timestamp = Date.now();\n\n  function markReadComplete(entities: Entity[]) {\n    const readDuration = ((Date.now() - timestamp) / 1000).toFixed(1);\n    timestamp = Date.now();\n    logger.info(\n      `Read ${entities?.length ?? 0} in ${readDuration} seconds. Committing...`,\n    );\n    return { markCommitComplete };\n  }\n\n  function markCommitComplete(entities: Entity[]) {\n    const commitDuration = ((Date.now() - timestamp) / 1000).toFixed(1);\n    logger.info(\n      `Committed ${entities?.length ?? 0} in ${commitDuration} seconds.`,\n    );\n  }\n\n  return { markReadComplete };\n}\n"],"names":["readProviderConfigs","defaultResourceTransformer","uuid","readPuppetNodes","ENDPOINT_NODES","merge","ANNOTATION_LOCATION","ANNOTATION_ORIGIN_LOCATION"],"mappings":"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"}
+{"version":3,"file":"PuppetDbEntityProvider.cjs.js","sources":["../../src/providers/PuppetDbEntityProvider.ts"],"sourcesContent":["/*\n * Copyright 2021 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 {\n  EntityProvider,\n  EntityProviderConnection,\n} from '@backstage/plugin-catalog-node';\nimport {\n  PuppetDbEntityProviderConfig,\n  readProviderConfigs,\n} from './PuppetDbEntityProviderConfig';\nimport { Config } from '@backstage/config';\nimport { randomUUID } from 'node:crypto';\nimport { defaultResourceTransformer, ResourceTransformer } from '../puppet';\nimport {\n  ANNOTATION_LOCATION,\n  ANNOTATION_ORIGIN_LOCATION,\n  Entity,\n} from '@backstage/catalog-model';\nimport { merge } from 'lodash';\nimport { readPuppetNodes } from '../puppet/read';\nimport { ENDPOINT_NODES } from '../puppet/constants';\nimport {\n  SchedulerService,\n  SchedulerServiceTaskRunner,\n  LoggerService,\n} from '@backstage/backend-plugin-api';\n\n/**\n * Reads nodes from [PuppetDB](https://www.puppet.com/docs/puppet/6/puppetdb_overview.html)\n * based on the provided query and registers them as Resource entities in the catalog.\n *\n * @public\n */\nexport class PuppetDbEntityProvider implements EntityProvider {\n  private readonly config: PuppetDbEntityProviderConfig;\n  private readonly logger: LoggerService;\n  private readonly scheduleFn: () => Promise<void>;\n  private readonly transformer: ResourceTransformer;\n  private connection?: EntityProviderConnection;\n\n  /**\n   * Creates instances of {@link PuppetDbEntityProvider} from a configuration.\n   *\n   * @param config - The configuration to read provider information from.\n   * @param deps - The dependencies for  {@link PuppetDbEntityProvider}.\n   *\n   * @returns A list of {@link PuppetDbEntityProvider} instances.\n   */\n  static fromConfig(\n    config: Config,\n    deps: {\n      logger: LoggerService;\n      schedule?: SchedulerServiceTaskRunner;\n      scheduler?: SchedulerService;\n      transformer?: ResourceTransformer;\n    },\n  ): PuppetDbEntityProvider[] {\n    if (!deps.schedule && !deps.scheduler) {\n      throw new Error('Either schedule or scheduler must be provided.');\n    }\n\n    return readProviderConfigs(config).map(providerConfig => {\n      if (!deps.schedule && !providerConfig.schedule) {\n        throw new Error(\n          `No schedule provided neither via code nor config for puppet-provider:${providerConfig.id}.`,\n        );\n      }\n\n      const taskRunner =\n        deps.schedule ??\n        deps.scheduler!.createScheduledTaskRunner(providerConfig.schedule!);\n\n      const transformer = deps.transformer ?? defaultResourceTransformer;\n\n      return new PuppetDbEntityProvider(\n        providerConfig,\n        deps.logger,\n        taskRunner,\n        transformer,\n      );\n    });\n  }\n\n  /**\n   * Creates an instance of {@link PuppetDbEntityProvider}.\n   *\n   * @param config - Configuration of the provider.\n   * @param logger - The instance of a {@link @backstage/backend-plugin-api#LoggerService}.\n   * @param taskRunner - The instance of {@link @backstage/backend-plugin-api#SchedulerServiceTaskRunner}.\n   * @param transformer - A {@link ResourceTransformer} function.\n   *\n   */\n  private constructor(\n    config: PuppetDbEntityProviderConfig,\n    logger: LoggerService,\n    taskRunner: SchedulerServiceTaskRunner,\n    transformer: ResourceTransformer,\n  ) {\n    this.config = config;\n    this.logger = logger.child({\n      target: this.getProviderName(),\n    });\n    this.scheduleFn = this.createScheduleFn(taskRunner);\n    this.transformer = transformer;\n  }\n\n  /** {@inheritdoc @backstage/plugin-catalog-node#EntityProvider.connect} */\n  async connect(connection: EntityProviderConnection): Promise<void> {\n    this.connection = connection;\n    await this.scheduleFn();\n  }\n\n  /** {@inheritdoc @backstage/plugin-catalog-node#EntityProvider.getProviderName} */\n  getProviderName(): string {\n    return `puppetdb-provider:${this.config.id}`;\n  }\n\n  /**\n   * Creates a function that can be used to schedule a refresh of the catalog.\n   *\n   * @param taskRunner - The instance of {@link @backstage/backend-plugin-api#SchedulerServiceTaskRunner}.\n   */\n  private createScheduleFn(\n    taskRunner: SchedulerServiceTaskRunner,\n  ): () => Promise<void> {\n    return async () => {\n      const taskId = `${this.getProviderName()}:refresh`;\n      return taskRunner.run({\n        id: taskId,\n        fn: async () => {\n          const logger = this.logger.child({\n            class: PuppetDbEntityProvider.prototype.constructor.name,\n            taskId,\n            taskInstanceId: randomUUID(),\n          });\n          try {\n            await this.refresh(logger);\n          } catch (error) {\n            logger.error(\n              `${this.getProviderName()} refresh failed, ${error}`,\n              error,\n            );\n          }\n        },\n      });\n    };\n  }\n\n  /**\n   * Refreshes the catalog by reading nodes from PuppetDB and registering them as Resource Entities.\n   *\n   * @param logger - The instance of a Logger.\n   */\n  async refresh(logger: LoggerService) {\n    if (!this.connection) {\n      throw new Error('Not initialized');\n    }\n\n    const { markReadComplete } = trackProgress(logger);\n    const entities = await readPuppetNodes(this.config, {\n      logger,\n      transformer: this.transformer,\n    });\n    const { markCommitComplete } = markReadComplete(entities);\n\n    await this.connection.applyMutation({\n      type: 'full',\n      entities: [...entities].map(entity => ({\n        locationKey: this.getProviderName(),\n        entity: withLocations(this.config.baseUrl, entity),\n      })),\n    });\n    markCommitComplete(entities);\n  }\n}\n\n/**\n * Ensures the entities have required annotation data.\n *\n * @param baseUrl - The base URL of the PuppetDB instance.\n * @param entity - The entity to add the annotations to.\n *\n * @returns Entity with @{@link ANNOTATION_LOCATION} and @{@link ANNOTATION_ORIGIN_LOCATION} annotations.\n */\nfunction withLocations(baseUrl: string, entity: Entity): Entity {\n  const location = `${baseUrl}/${ENDPOINT_NODES}/${entity.metadata?.name}`;\n\n  return merge(\n    {\n      metadata: {\n        annotations: {\n          [ANNOTATION_LOCATION]: `url:${location}`,\n          [ANNOTATION_ORIGIN_LOCATION]: `url:${location}`,\n        },\n      },\n    },\n    entity,\n  ) as Entity;\n}\n\n/**\n * Tracks the progress of the PuppetDB read and commit operations.\n *\n * @param logger - The instance of a {@link @backstage/backend-plugin-api#LoggerService}.\n */\nfunction trackProgress(logger: LoggerService) {\n  let timestamp = Date.now();\n\n  function markReadComplete(entities: Entity[]) {\n    const readDuration = ((Date.now() - timestamp) / 1000).toFixed(1);\n    timestamp = Date.now();\n    logger.info(\n      `Read ${entities?.length ?? 0} in ${readDuration} seconds. Committing...`,\n    );\n    return { markCommitComplete };\n  }\n\n  function markCommitComplete(entities: Entity[]) {\n    const commitDuration = ((Date.now() - timestamp) / 1000).toFixed(1);\n    logger.info(\n      `Committed ${entities?.length ?? 0} in ${commitDuration} seconds.`,\n    );\n  }\n\n  return { markReadComplete };\n}\n"],"names":["readProviderConfigs","defaultResourceTransformer","randomUUID","readPuppetNodes","ENDPOINT_NODES","merge","ANNOTATION_LOCATION","ANNOTATION_ORIGIN_LOCATION"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-puppetdb",
-  "version": "0.2.22-next.0",
+  "version": "0.2.22-next.1",
   "description": "A Backstage catalog backend module that helps integrate towards PuppetDB",
   "backstage": {
     "role": "backend-plugin-module",
@@ -58,17 +58,16 @@
   },
   "dependencies": {
     "@backstage/backend-plugin-api": "1.9.1-next.0",
-    "@backstage/catalog-model": "1.8.1-next.0",
+    "@backstage/catalog-model": "1.8.1-next.1",
     "@backstage/config": "1.3.8-next.0",
     "@backstage/errors": "1.3.1-next.0",
-    "@backstage/plugin-catalog-node": "2.2.1-next.0",
+    "@backstage/plugin-catalog-node": "2.2.1-next.1",
     "@backstage/types": "1.2.2",
-    "lodash": "^4.17.21",
-    "uuid": "^11.0.0"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "1.11.3-next.0",
-    "@backstage/cli": "0.36.2-next.0",
+    "@backstage/backend-test-utils": "1.11.3-next.1",
+    "@backstage/cli": "0.36.2-next.1",
     "@types/lodash": "^4.14.151",
     "msw": "^1.0.0"
   },