consolidate tags reducers

HackerHappyHour · Dec 5, 2020 · c4cf549 · c4cf549
1 parent 65b702e
commit c4cf549
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/__tests__/utils.js b/__tests__/utils.js
@@ -1,4 +1,4 @@
-const {extraTagsReducer, getInputBoolean, getInputList, conditionalTagsReducer} = require('../src/utils')
+const {tagsReducer, getInputBoolean, getInputList} = require('../src/utils')
 const {getInputBooleanScenarios, getInputListScenarios} = require('./__data__/utils')
 
 describe('getInputBoolean', () => {
@@ -16,10 +16,10 @@ describe('getInputList', ()=>{
 
 })
 
-describe('extraTagsReducer', () => {
+describe('tagsReducer', () => {
   test('reduces imperative booleans',() => {
 
-    let extraTagsOutput = ['latest::true', 'edge::true', 'canary::false'].reduce(extraTagsReducer, [])
+    let extraTagsOutput = ['latest::true', 'edge::true', 'canary::false'].reduce(tagsReducer, [])
     expect(extraTagsOutput).toEqual(['latest', 'edge'])
   })
 

diff --git a/src/taggingStrategy.js b/src/taggingStrategy.js
@@ -1,10 +1,10 @@
 const {parseTag} = require('./parseTag')
-const {extraTagsReducer, conditionalTagsReducer, imageNameReducer, getInputList} = require('./utils')
+const {tagsReducer, imageNameReducer, getInputList} = require('./utils')
 
 exports.taggingStrategy = ({inputTags, tagName, imageName, extraTags}) => {
   try {
     let outputTags = getInputList(inputTags)
-      .reduce(extraTagsReducer, [])
+      .reduce(tagsReducer, [])
       .map(strategy => parseTag(strategy, tagName))
       .reduce(imageNameReducer(imageName), [])
 
@@ -13,7 +13,7 @@ exports.taggingStrategy = ({inputTags, tagName, imageName, extraTags}) => {
       // reduce imageNames for extraTags
       // push the extraTag to outputTags array 
       getInputList(extraTags)
-        .reduce(extraTagsReducer, [])
+        .reduce(tagsReducer, [])
         .map(extraTag => imageName ? `${imageName}:${extraTag}`: `${extraTag}`)
         .forEach(extraTag => outputTags.push(extraTag))
 

diff --git a/src/utils.js b/src/utils.js
@@ -21,24 +21,7 @@ exports.getInputBoolean = (input) => {
   return boolTest.test(input)
 }
 
-exports.conditionalTagsReducer = (tags,tag) => {
-  const isConditionalTag = /(?<strategy>.*)::'?(?<include>true|false)/i
-
-  // tag has condition specified, so only return 
-  //the tag if the condition is true
-  if(isConditionalTag.test(tag)){
-    let {groups} = tag.match(isConditionalTag)
-    if(groups.include == ('true'||true)) {
-      return [...tags, groups.strategy]
-    } else {
-      return tags
-    }
-  } 
-
-  return [...tags, tag]
-}
-
-exports.extraTagsReducer = (tags,tag) => {
+exports.tagsReducer = (tags,tag) => {
   let isConditionalTag = tag.search('::')
   // tag has condition specified, so only return 
   //the tag if the condition is true