fix(annotator-action): fix generation annotation backstage.io/created…

…At (#2114) Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
janus-idp · Sep 6, 2024 · 62587be · 62587be
1 parent de81c0f
commit 62587be
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/plugins/scaffolder-annotator-action/src/actions/annotator/annotator.test.ts b/plugins/scaffolder-annotator-action/src/actions/annotator/annotator.test.ts
@@ -20,7 +20,11 @@ describe('catalog annotator', () => {
       'catalog:timestamping',
       'Creates a new `catalog:timestamping` Scaffolder action to annotate scaffolded entities with creation timestamp.',
       'some logger info msg',
-      { annotations: { 'backstage.io/createdAt': getCurrentTimestamp() } },
+      () => {
+        return {
+          annotations: { 'backstage.io/createdAt': getCurrentTimestamp() },
+        };
+      },
     );
 
     const logger = getVoidLogger();
@@ -67,7 +71,9 @@ describe('catalog annotator', () => {
       'catalog:test-annotate',
       'Creates a new `catalog:test-annotate` Scaffolder action to annotate catalog-info.yaml with labels and annotations.',
       '',
-      {},
+      () => {
+        return {};
+      },
     );
 
     const logger = getVoidLogger();
@@ -126,7 +132,9 @@ describe('catalog annotator', () => {
       'catalog:test-annotate-obj',
       'Creates a new `catalog:test-annotate-obj` Scaffolder action to annotate any object yaml with labels and annotations.',
       'some logger info message',
-      {},
+      () => {
+        return {};
+      },
     );
 
     const logger = getVoidLogger();
@@ -199,8 +207,8 @@ describe('catalog annotator', () => {
       'catalog:entityRef',
       'Some description',
       'some logger info msg',
-      {
-        spec: { scaffoldedFrom: 'testt-ref' },
+      () => {
+        return { spec: { scaffoldedFrom: 'testt-ref' } };
       },
     );
 
@@ -245,8 +253,12 @@ describe('catalog annotator', () => {
       'catalog:entityRef',
       'Some description',
       'some logger info msg',
-      {
-        spec: { scaffoldedFrom: { readFromContext: 'templateInfo.entityRef' } },
+      () => {
+        return {
+          spec: {
+            scaffoldedFrom: { readFromContext: 'templateInfo.entityRef' },
+          },
+        };
       },
     );
 

diff --git a/plugins/scaffolder-annotator-action/src/actions/annotator/annotator.ts b/plugins/scaffolder-annotator-action/src/actions/annotator/annotator.ts
@@ -16,7 +16,7 @@ export const createAnnotatorAction = (
   actionId: string = 'catalog:annotate',
   actionDescription?: string,
   loggerInfoMsg?: string,
-  annotateEntityObject?: {
+  annotateEntityObjectProvider?: () => {
     annotations?: { [key: string]: string };
     labels?: { [key: string]: string };
     spec?: { [key: string]: Value };
@@ -86,6 +86,7 @@ export const createAnnotatorAction = (
       },
     },
     async handler(ctx) {
+      const annotateEntityObject = annotateEntityObjectProvider?.();
       let objToAnnotate: { [key: string]: any };
 
       if (ctx.input?.objectYaml) {

diff --git a/plugins/scaffolder-annotator-action/src/actions/customActions/createScaffoldedFromAction.ts b/plugins/scaffolder-annotator-action/src/actions/customActions/createScaffoldedFromAction.ts
@@ -5,10 +5,12 @@ export const createScaffoldedFromAction = () => {
     'catalog:scaffolded-from',
     'Creates a new `catalog:scaffolded-from` scaffolder action to update a catalog-info.yaml with the entityRef of the template that created it.',
     'Annotating catalog-info.yaml with template entityRef',
-    {
-      spec: {
-        scaffoldedFrom: { readFromContext: 'templateInfo.entityRef' },
-      },
+    () => {
+      return {
+        spec: {
+          scaffoldedFrom: { readFromContext: 'templateInfo.entityRef' },
+        },
+      };
     },
   );
 };
diff --git a/plugins/scaffolder-annotator-action/src/actions/customActions/createTimestampAction.ts b/plugins/scaffolder-annotator-action/src/actions/customActions/createTimestampAction.ts
@@ -6,6 +6,10 @@ export const createTimestampAction = () => {
     'catalog:timestamping',
     'Creates a new `catalog:timestamping` Scaffolder action to annotate scaffolded entities with creation timestamp.',
     'Annotating catalog-info.yaml with current timestamp',
-    { annotations: { 'backstage.io/createdAt': getCurrentTimestamp() } },
+    () => {
+      return {
+        annotations: { 'backstage.io/createdAt': getCurrentTimestamp() },
+      };
+    },
   );
 };