From 3b8f0fbf01f7c52022ac0c41d02997538d38cd78 Mon Sep 17 00:00:00 2001
From: Tomas Dabasinskas <tomas@dabasinskas.net>
Date: Sun, 5 Feb 2023 21:14:46 +0200
Subject: [PATCH] Rename default owner constant

Signed-off-by: Tomas Dabasinskas <tomas@dabasinskas.net>
---
 plugins/catalog-backend-module-puppetdb/package.json   |  2 +-
 .../src/providers/PuppetDbEntityProvider.test.ts       | 10 +++++-----
 .../src/puppet/constants.ts                            |  2 +-
 .../src/puppet/transformers.test.ts                    |  4 ++--
 .../src/puppet/transformers.ts                         |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index 440c7e48af..0ccb2fc24d 100644
--- a/plugins/catalog-backend-module-puppetdb/package.json
+++ b/plugins/catalog-backend-module-puppetdb/package.json
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/backstage/backstage",
-    "directory": "catalog-backend-module-puppetdb"
+    "directory": "plugins/catalog-backend-module-puppetdb"
   },
   "keywords": [
     "backstage",
diff --git a/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.test.ts b/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.test.ts
index b049c16856..b72e0b8401 100644
--- a/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.test.ts
@@ -25,7 +25,7 @@ import {
   ANNOTATION_LOCATION,
   ANNOTATION_ORIGIN_LOCATION,
 } from '@backstage/catalog-model/';
-import { DEFAULT_OWNER, ENDPOINT_NODES } from '../puppet/constants';
+import { DEFAULT_ENTITY_OWNER, ENDPOINT_NODES } from '../puppet/constants';
 
 const logger = getVoidLogger();
 
@@ -110,7 +110,7 @@ describe('PuppetEntityProvider', () => {
             description: 'Description 1',
             spec: {
               type: 'virtual-machine',
-              owner: DEFAULT_OWNER,
+              owner: DEFAULT_ENTITY_OWNER,
               dependsOn: [],
               dependencyOf: [],
             },
@@ -129,7 +129,7 @@ describe('PuppetEntityProvider', () => {
             description: 'Description 2',
             spec: {
               type: 'physical-server',
-              owner: DEFAULT_OWNER,
+              owner: DEFAULT_ENTITY_OWNER,
               dependsOn: [],
               dependencyOf: [],
             },
@@ -175,7 +175,7 @@ describe('PuppetEntityProvider', () => {
                 description: 'Description 1',
                 spec: {
                   type: 'virtual-machine',
-                  owner: DEFAULT_OWNER,
+                  owner: DEFAULT_ENTITY_OWNER,
                   dependsOn: [],
                   dependencyOf: [],
                 },
@@ -203,7 +203,7 @@ describe('PuppetEntityProvider', () => {
                 description: 'Description 2',
                 spec: {
                   type: 'physical-server',
-                  owner: DEFAULT_OWNER,
+                  owner: DEFAULT_ENTITY_OWNER,
                   dependsOn: [],
                   dependencyOf: [],
                 },
diff --git a/plugins/catalog-backend-module-puppetdb/src/puppet/constants.ts b/plugins/catalog-backend-module-puppetdb/src/puppet/constants.ts
index 672bc48932..bf093182f2 100644
--- a/plugins/catalog-backend-module-puppetdb/src/puppet/constants.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/puppet/constants.ts
@@ -36,4 +36,4 @@ export const ENDPOINT_NODES = '/pdb/query/v4/nodes';
  *
  * @public
  */
-export const DEFAULT_OWNER = 'unknown';
+export const DEFAULT_ENTITY_OWNER = 'unknown';
diff --git a/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.test.ts b/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.test.ts
index f7d3813bf6..15f3bc1419 100644
--- a/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.test.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.test.ts
@@ -18,7 +18,7 @@ import { PuppetDbEntityProviderConfig } from '../providers';
 import { PuppetNode } from './types';
 import { defaultResourceTransformer } from './transformers';
 import { DEFAULT_NAMESPACE } from '@backstage/catalog-model';
-import { ANNOTATION_PUPPET_CERTNAME, DEFAULT_OWNER } from './constants';
+import { ANNOTATION_PUPPET_CERTNAME, DEFAULT_ENTITY_OWNER } from './constants';
 
 describe('defaultResourceTransformer', () => {
   it('should transform a puppet node to a resource entity', async () => {
@@ -75,7 +75,7 @@ describe('defaultResourceTransformer', () => {
       },
       spec: {
         type: 'virtual-machine',
-        owner: DEFAULT_OWNER,
+        owner: DEFAULT_ENTITY_OWNER,
         dependsOn: [],
         dependencyOf: [],
       },
diff --git a/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.ts b/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.ts
index ec4c4a2af3..d99d89b1cf 100644
--- a/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/puppet/transformers.ts
@@ -16,7 +16,7 @@
 
 import { ResourceTransformer } from './types';
 import { DEFAULT_NAMESPACE, ResourceEntity } from '@backstage/catalog-model';
-import { ANNOTATION_PUPPET_CERTNAME, DEFAULT_OWNER } from './constants';
+import { ANNOTATION_PUPPET_CERTNAME, DEFAULT_ENTITY_OWNER } from './constants';
 
 /**
  * A default implementation of the {@link ResourceTransformer}.
@@ -54,7 +54,7 @@ export const defaultResourceTransformer: ResourceTransformer = async (
     },
     spec: {
       type: type,
-      owner: DEFAULT_OWNER,
+      owner: DEFAULT_ENTITY_OWNER,
       dependsOn: [],
       dependencyOf: [],
     },