change disable settings to enable instead

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

README.md

@@ -15,27 +15,26 @@ Usage:
   azure-janitor [OPTIONS]
 
 Application Options:
-      --dry-run                         Dry run (no delete) [$DRYRUN]
-      --debug                           debug mode [$DEBUG]
-  -v, --verbose                         verbose mode [$VERBOSE]
-      --log.json                        Switch log output to json format [$LOG_JSON]
-      --azure-environment=              Azure environment name (default: AZUREPUBLICCLOUD) [$AZURE_ENVIRONMENT]
-      --azure-subscription=             Azure subscription ID [$AZURE_SUBSCRIPTION_ID]
-      --janitor.interval=               Janitor interval (time.duration) (default: 1h) [$JANITOR_INTERVAL]
-      --janitor.tag=                    Janitor azure tag (string) (default: ttl) [$JANITOR_TAG]
-      --janitor.deployment.ttl=         Janitor deploument ttl (time.duration) (default: 8760h)
-                                        [$JANITOR_DEPLOYMENT_TTL]
-      --janitor.deployment.limit=       Janitor deploument limit count (int) (default: 700) [$JANITOR_DEPLOYMENT_LIMIT]
-      --janitor.disable.resourcegroups  Disable Azure ResourceGroups cleanup [$JANITOR_DISABLE_RESOURCEGROUPS]
-      --janitor.disable.resources       Disable Azure Resources cleanup [$JANITOR_DISABLE_RESOURCES]
-      --janitor.disable.deployments     Disable Azure Deployments cleanup [$JANITOR_DISABLE_DEPLOYMENTS]
-      --janitor.filter.resourcegroups=  Additional $filter for Azure REST API for ResourceGroups
-                                        [$JANITOR_FILTER_RESOURCEGROUPS]
-      --janitor.filter.resources=       Additional $filter for Azure REST API for Resources [$JANITOR_FILTER_RESOURCES]
-      --bind=                           Server address (default: :8080) [$SERVER_BIND]
+      --dry-run                        Dry run (no delete) [$DRYRUN]
+      --debug                          debug mode [$DEBUG]
+  -v, --verbose                        verbose mode [$VERBOSE]
+      --log.json                       Switch log output to json format [$LOG_JSON]
+      --azure-environment=             Azure environment name (default: AZUREPUBLICCLOUD) [$AZURE_ENVIRONMENT]
+      --azure-subscription=            Azure subscription ID [$AZURE_SUBSCRIPTION_ID]
+      --janitor.interval=              Janitor interval (time.duration) (default: 1h) [$JANITOR_INTERVAL]
+      --janitor.tag=                   Janitor azure tag (string) (default: ttl) [$JANITOR_TAG]
+      --janitor.deployment.ttl=        Janitor deploument ttl (time.duration) (default: 8760h) [$JANITOR_DEPLOYMENT_TTL]
+      --janitor.deployment.limit=      Janitor deploument limit count (int) (default: 700) [$JANITOR_DEPLOYMENT_LIMIT]
+      --janitor.enable.resourcegroups  Enable Azure ResourceGroups cleanup [$JANITOR_ENABLE_RESOURCEGROUPS]
+      --janitor.enable.resources       Enable Azure Resources cleanup [$JANITOR_ENABLE_RESOURCES]
+      --janitor.enable.deployments     Enable Azure Deployments cleanup [$JANITOR_ENABLE_DEPLOYMENTS]
+      --janitor.filter.resourcegroups= Additional $filter for Azure REST API for ResourceGroups
+                                       [$JANITOR_FILTER_RESOURCEGROUPS]
+      --janitor.filter.resources=      Additional $filter for Azure REST API for Resources [$JANITOR_FILTER_RESOURCES]
+      --bind=                          Server address (default: :8080) [$SERVER_BIND]
 
 Help Options:
-  -h, --help                            Show this help message
+  -h, --help                           Show this help message
 ```
 
 for Azure API authentication (using ENV vars) see https://github.com/Azure/azure-sdk-for-go#authentication

config/opts.go

@@ -32,9 +32,9 @@ type (
 			DeploymentsTtl   time.Duration `long:"janitor.deployment.ttl"      env:"JANITOR_DEPLOYMENT_TTL"  description:"Janitor deploument ttl (time.duration)"  default:"8760h"`
 			DeploymentsLimit int64         `long:"janitor.deployment.limit"      env:"JANITOR_DEPLOYMENT_LIMIT"  description:"Janitor deploument limit count (int)"  default:"700"`
 
-			DisableResourceGroups bool `long:"janitor.disable.resourcegroups" env:"JANITOR_DISABLE_RESOURCEGROUPS"  description:"Disable Azure ResourceGroups cleanup"`
-			DisableResources      bool `long:"janitor.disable.resources"      env:"JANITOR_DISABLE_RESOURCES"  description:"Disable Azure Resources cleanup"`
-			DisableDeployments    bool `long:"janitor.disable.deployments"      env:"JANITOR_DISABLE_DEPLOYMENTS"  description:"Disable Azure Deployments cleanup"`
+			EnableResourceGroups bool `long:"janitor.enable.resourcegroups" env:"JANITOR_ENABLE_RESOURCEGROUPS"  description:"Enable Azure ResourceGroups cleanup"`
+			EnableResources      bool `long:"janitor.enable.resources"      env:"JANITOR_ENABLE_RESOURCES"  description:"Enable Azure Resources cleanup"`
+			EnableDeployments    bool `long:"janitor.enable.deployments"      env:"JANITOR_ENABLE_DEPLOYMENTS"  description:"Enable Azure Deployments cleanup"`
 
 			AdditionalFilterResourceGroups *string `long:"janitor.filter.resourcegroups" env:"JANITOR_FILTER_RESOURCEGROUPS"  description:"Additional $filter for Azure REST API for ResourceGroups"`
 			AdditionalFilterResources      *string `long:"janitor.filter.resources"      env:"JANITOR_FILTER_RESOURCES"  description:"Additional $filter for Azure REST API for Resources"`

janitor.go

@@ -63,15 +63,15 @@ func (j *Janitor) Run() {
 				go func(subscription subscriptions.Subscription) {
 					defer wgMain.Done()
 
-					if !opts.Janitor.DisableResourceGroups {
+					if opts.Janitor.EnableResourceGroups {
 						j.runResourceGroups(ctx, subscription, opts.Janitor.FilterResourceGroups, callbackTtlMetrics)
 					}
 
-					if !opts.Janitor.DisableResources {
+					if opts.Janitor.EnableResources {
 						j.runResources(ctx, subscription, opts.Janitor.FilterResources, callbackTtlMetrics)
 					}
 
-					if !opts.Janitor.DisableDeployments {
+					if opts.Janitor.EnableDeployments {
 						j.runDeployments(ctx, subscription, callbackTtlMetrics)
 					}
 				}(subscription)

main.go

@@ -56,19 +56,19 @@ func main() {
 
 	log.Infof("init Janitor")
 
-	if !opts.Janitor.DisableResourceGroups {
+	if opts.Janitor.EnableResourceGroups {
 		log.Infof("enabled Azure ResourceGroups cleanup (filter: %s)", opts.Janitor.FilterResourceGroups)
 	} else {
 		log.Infof("disabled Azure ResourceGroups cleanup")
 	}
 
-	if !opts.Janitor.DisableResources {
+	if opts.Janitor.EnableResources {
 		log.Infof("enabled Azure Resources cleanup (filter: %s)", opts.Janitor.FilterResources)
 	} else {
 		log.Infof("disabled Azure Resources cleanup")
 	}
 
-	if !opts.Janitor.DisableDeployments {
+	if opts.Janitor.EnableDeployments {
 		log.Infof("enabled Azure ResourceGroups Deployments cleanup (limit: %v, ttl: %v)", opts.Janitor.DeploymentsLimit, opts.Janitor.DeploymentsTtl.String())
 	} else {
 		log.Infof("disabled Azure ResourceGroups Deployments cleanup")
@@ -152,6 +152,10 @@ func initArgparser() {
 	if opts.Janitor.AdditionalFilterResources != nil {
 		opts.Janitor.FilterResources = *opts.Janitor.AdditionalFilterResources
 	}
+
+	if !opts.Janitor.EnableResourceGroups && !opts.Janitor.EnableResources && !opts.Janitor.EnableDeployments {
+		log.Fatal("no janitor task (resources, resourcegroups, deployments) enabled, not starting")
+	}
 }
 
 // Init and build Azure authorzier