Merge pull request #48 from hortonworks/CB-12290

CB-12290 Introduce flag for disabling ignore label usage

README.MD

@@ -115,6 +115,8 @@ DRY RUN:
 	-d
 VERBOSE:
 	-v
+DISABLE_IGNORE_LABEL:
+	-i
 HELP:
 	-h
 ```

context/context.go

@@ -32,6 +32,9 @@ var DryRun = false
 // Verbose is a global flag for verbose logging
 var Verbose = false
 
+// IgnoreLabelDisabled is a global flag for enabling/disabling ignore label usage
+var IgnoreLabelDisabled = true
+
 // Operations contains all the available operations
 var Operations = make(map[types.OpType]types.Operation)
 

filter/common.go

@@ -36,12 +36,16 @@ func isFilterMatch(filterName string, item types.CloudItem, filterType types.Fil
 		ignoreLabelFound := utils.IsAnyMatch(inst.Tags, ctx.IgnoreLabel)
 		if ignoreLabelFound {
 			log.Debugf("[%s] Found ignore label on item: %s, label: %s", filterName, name, ctx.IgnoreLabel)
-			if filterType.IsInclusive() {
-				log.Debugf("[%s] inclusive filter applied on item: %s", filterName, name)
-				return false
+			if ctx.IgnoreLabelDisabled {
+				log.Debugf("[%s] Ignore label usage is disabled, continuing to apply filter on item: %s", filterName, name)
+			} else {
+				if filterType.IsInclusive() {
+					log.Debugf("[%s] inclusive filter applied on item: %s", filterName, name)
+					return false
+				}
+				log.Debugf("[%s] exclusive filter applied on item: %s", filterName, name)
+				return true
 			}
-			log.Debugf("[%s] exclusive filter applied on item: %s", filterName, name)
-			return true
 		}
 		filtered, applied := applyFilterConfig(filterConfig, filterType, item, filterName, inst.Tags)
 		if applied {
@@ -53,12 +57,16 @@ func isFilterMatch(filterName string, item types.CloudItem, filterType types.Fil
 		ignoreLabelFound := utils.IsAnyMatch(stack.Tags, ctx.IgnoreLabel)
 		if ignoreLabelFound {
 			log.Debugf("[%s] Found ignore label on item: %s, label: %s", filterName, name, ctx.IgnoreLabel)
-			if filterType.IsInclusive() {
-				log.Debugf("[%s] inclusive filter applied on item: %s", filterName, name)
-				return false
+			if ctx.IgnoreLabelDisabled {
+				log.Debugf("[%s] Ignore label usage is disabled, continuing to apply filter on item: %s", filterName, name)
+			} else {
+				if filterType.IsInclusive() {
+					log.Debugf("[%s] inclusive filter applied on item: %s", filterName, name)
+					return false
+				}
+				log.Debugf("[%s] exclusive filter applied on item: %s", filterName, name)
+				return true
 			}
-			log.Debugf("[%s] exclusive filter applied on item: %s", filterName, name)
-			return true
 		}
 		filtered, applied := applyFilterConfig(filterConfig, filterType, item, filterName, stack.Tags)
 		if applied {
@@ -84,12 +92,16 @@ func isFilterMatch(filterName string, item types.CloudItem, filterType types.Fil
 		ignoreLabelFound := utils.IsAnyMatch(database.Tags, ctx.IgnoreLabel)
 		if ignoreLabelFound {
 			log.Debugf("[%s] Found ignore label on item: %s, label: %s", filterName, name, ctx.IgnoreLabel)
-			if filterType.IsInclusive() {
-				log.Debugf("[%s] inclusive filter applied on item: %s", filterName, name)
-				return false
+			if ctx.IgnoreLabelDisabled {
+				log.Debugf("[%s] Ignore label usage is disabled, continuing to apply filter on item: %s", filterName, name)
+			} else {
+				if filterType.IsInclusive() {
+					log.Debugf("[%s] inclusive filter applied on item: %s", filterName, name)
+					return false
+				}
+				log.Debugf("[%s] exclusive filter applied on item: %s", filterName, name)
+				return true
 			}
-			log.Debugf("[%s] exclusive filter applied on item: %s", filterName, name)
-			return true
 		}
 		filtered, applied := applyFilterConfig(filterConfig, filterType, item, filterName, database.Tags)
 		if applied {

main.go

@@ -35,6 +35,7 @@ func main() {
 	filterConfigLoc := flag.String("fc", "", "filterConfig YAML")
 	dryRun := flag.Bool("d", false, "dry run")
 	verbose := flag.Bool("v", false, "verbose")
+	ignoreLabelDisabled := flag.Bool("i", false, "disable ignore label")
 
 	flag.Parse()
 
@@ -48,6 +49,7 @@ func main() {
 	if ctx.Verbose {
 		log.SetLevel(log.DebugLevel)
 	}
+	ctx.IgnoreLabelDisabled = *ignoreLabelDisabled
 
 	if filterConfigLoc != nil && len(*filterConfigLoc) != 0 {
 		var err error
@@ -141,5 +143,6 @@ OPERATIONS:`)
 	println("FILTER_CONFIG:\n\t-fc=/location/of/filter/config.yml")
 	println("DRY RUN:\n\t-d")
 	println("VERBOSE:\n\t-v")
+	println("DISABLE_IGNORE_LABEL:\n\t-i")
 	println("HELP:\n\t-h")
 }