Merge pull request #661 from HaveAGitGat/tags_fix

Trim and filter tags
HaveAGitGat · Jun 10, 2024 · 6d6ff0b · 6d6ff0b
2 parents c132a2f + b6a2df1
commit 6d6ff0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/FlowPlugins/CommunityFlowPlugins/tools/tagsWorkerType/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/tools/tagsWorkerType/1.0.0/index.js
@@ -68,7 +68,7 @@ var plugin = function (args) {
     var currentTags = [];
     requiredTags.push("require".concat(requiredWorkerType));
     if (requiredNodeTags) {
-        requiredTags = requiredTags.concat(requiredNodeTags.split(',').map(function (tag) { return tag.trim(); }));
+        requiredTags = requiredTags.concat(requiredNodeTags.split(','));
     }
     var currentWorkerType = args.workerType;
     if (requiredWorkerType === 'CPUorGPU') {
@@ -86,8 +86,10 @@ var plugin = function (args) {
         }
     }
     if (args.nodeTags) {
-        currentTags = currentTags.concat(args.nodeTags.split(',').map(function (tag) { return tag.trim(); }));
+        currentTags = currentTags.concat(args.nodeTags.split(','));
     }
+    requiredTags = requiredTags.map(function (tag) { return tag.trim(); }).filter(function (tag) { return tag !== ''; });
+    currentTags = currentTags.map(function (tag) { return tag.trim(); }).filter(function (tag) { return tag !== ''; });
     args.jobLog("Required Tags: ".concat(requiredTags.join(',')));
     args.jobLog("Current Tags: ".concat(currentTags.join(',')));
     var isSubset = true;

diff --git a/FlowPluginsTs/CommunityFlowPlugins/tools/tagsWorkerType/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/tools/tagsWorkerType/1.0.0/index.ts
@@ -84,7 +84,7 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
 
   requiredTags.push(`require${requiredWorkerType}`);
   if (requiredNodeTags) {
-    requiredTags = requiredTags.concat(requiredNodeTags.split(',').map((tag) => tag.trim()));
+    requiredTags = requiredTags.concat(requiredNodeTags.split(','));
   }
 
   const currentWorkerType = args.workerType;
@@ -102,9 +102,12 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
   }
 
   if (args.nodeTags) {
-    currentTags = currentTags.concat(args.nodeTags.split(',').map((tag) => tag.trim()));
+    currentTags = currentTags.concat(args.nodeTags.split(','));
   }
 
+  requiredTags = requiredTags.map((tag) => tag.trim()).filter((tag) => tag !== '');
+  currentTags = currentTags.map((tag) => tag.trim()).filter((tag) => tag !== '');
+
   args.jobLog(`Required Tags: ${requiredTags.join(',')}`);
   args.jobLog(`Current Tags: ${currentTags.join(',')}`);