quiverstaskrunner 0.1.254104 → 0.1.254172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df93667b776f70d0273680b76b91f231e1d616ae
-  data.tar.gz: 5b0009ef84d365b926701200599dadee2104f03e
+  metadata.gz: 78db79e6ff6dbc49edc518e0f8b14a7069cf63e9
+  data.tar.gz: 0fe66d028a0ebcc644ae08519d2ba4a349ab632f
 SHA512:
-  metadata.gz: aa0840201a1bc6946a40ee8e1967029b60629631be18d320d97e563a768d64968af718cf2d21eebdc174106d39bab87dd962ffcc5224a5eecf2d288cce79cce8
-  data.tar.gz: 96c5dd8bb6322e68cd6e3144893c82a7c15747fead80f08552677fe14ab953c877f11acd90bfc288cc5bfc6d0de6540d8410dcef0dc855f3b04ba2f3e76cfc9d
+  metadata.gz: fd705939f1b2a9889cd34d2f853fb826b7919b83f616654d0eaa5ae14a2111380c3ea19392956e8baa5215a2269c0272b434c90092a689cc3470e808a15b89f2
+  data.tar.gz: d3dfc834a76d83f5867ca12ac3dd059221f5a48eece019ce42ec515d783e15ed3ccce1d4ba2d40d35b4e00df73192ca6d37eba04efefc2b44f31f9b74535078d

data/lib/quiverstaskrunner/azuresetup.rb

@@ -10,6 +10,14 @@ require "quiverstaskrunner/helpers/settingshelper"
 include QuiversTaskrunner
 
 module QuiversTaskrunner
+	@@get_settings_options = { :cli_params_black_list => ["env", "nos", "no-swap", "nod", "no-staging-del", "verbose" ] }
+	@@secrets = {
+		:cloud_services => "secrets/cloud_services.yml",
+		:storage => "secrets/storage.yml",
+		:certs => "secrets/certs.yml",
+		:global => "secrets/global.yml"
+	}
+
 	module_function
 
 	def is_update_message_on
@@ -22,11 +30,24 @@ module QuiversTaskrunner
 		return update_message_on
 	end
 
+	def list_secrets(options={})
+		env = env || EnvHelper.get_env("env")
+		white_list = options[:white_list]
+		if (!white_list.nil?) && (!white_list.empty?)
+			@@secrets
+				.reject { |k,v| !white_list.detect { |x| k == x } }
+				.each { |k,v| puts "#{k}".colorize("yellow"); puts; puts "#{SettingsHelper.get_settings(File.join(Dir.pwd, v), env, @@get_settings_options)}" }
+		else
+			@@secrets
+				.each { |k,v| puts "#{k}".colorize("yellow"); puts; puts "#{SettingsHelper.get_settings(File.join(Dir.pwd, v), env, @@get_settings_options)}" }
+		end
+	end
+
 	def scale_host(cloud_service_name, service_configuration, service_definition, env=nil)
 		env = env || EnvHelper.get_env("env")
 
 		# 1. Get cloud service's details
-		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, "secrets/cloud_services.yml"), env)
+		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, @@secrets[:cloud_services]), env, @@get_settings_options)
 		cloud_service_details = cloud_services[cloud_service_name]
 		raise StandardError, "No details were found for cloud service #{cloud_service_name}" unless cloud_service_details
 		vmsize = cloud_service_details["vmsize"]
@@ -53,7 +74,7 @@ module QuiversTaskrunner
 		subscription_id = EnvHelper.get_env("azure_subscription_id")
 
 		# 2. Load secrets
-		storage = SettingsHelper.get_settings(File.join(Dir.pwd, "secrets/storage.yml"), env)
+		storage = SettingsHelper.get_settings(File.join(Dir.pwd, @@secrets[:storage]), env, @@get_settings_options)
 		storage_details = storage["blob"]
 		raise StandardError, "No details were found for blob storage for the #{env} environment" unless storage_details
 
@@ -102,11 +123,11 @@ module QuiversTaskrunner
 
 	def deploy_blob_pkg_to_staging(cloud_service_name, blob_pkg_name, pkg_dir, labels, options={})
 		# 1. Load cloud service's details
-		verbose = EnvHelper.get_env("verbose") || false
+		verbose = (defined? ARGV) && (!ARGV.nil?) && (!ARGV.empty?) && (ARGV.detect( |x| x == "verbose"))
 		env = options[:env] || EnvHelper.get_env("env")
 		timeout = options[:timeout] || 20*60 # 20 minutes
 		update_message_on = is_update_message_on
-		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, "secrets/cloud_services.yml"), env)
+		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, @@secrets[:cloud_services]), env, @@get_settings_options)
 		cloud_service_details = cloud_services[cloud_service_name]
 		raise StandardError, "No details were found for cloud service #{cloud_service_name}" unless cloud_service_details
 		if verbose
@@ -114,7 +135,7 @@ module QuiversTaskrunner
 			puts cloud_service_details
 		end
 		# 2. Load storage details
-		storage = SettingsHelper.get_settings(File.join(Dir.pwd, "secrets/storage.yml"), env)
+		storage = SettingsHelper.get_settings(File.join(Dir.pwd, @@secrets[:storage]), env, @@get_settings_options)
 		storage_details = storage["blob"]
 		raise StandardError, "No details were found for blob storage for the #{env} environment" unless storage_details
 
@@ -197,7 +218,7 @@ module QuiversTaskrunner
 		env = options[:env] || EnvHelper.get_env("env")
 		timeout = options[:timeout] || 20*60 # 20 minutes
 		update_message_on = is_update_message_on
-		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, "secrets/cloud_services.yml"), env)
+		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, @@secrets[:cloud_services]), env, @@get_settings_options)
 		cloud_service_details = cloud_services[cloud_service_name]
 		cloud_srv_name = cloud_service_details["name"]
 
@@ -250,7 +271,7 @@ module QuiversTaskrunner
 
 		# 1. Load cloud service's details
 		env = env || EnvHelper.get_env("env")
-		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, "secrets/cloud_services.yml"), env)
+		cloud_services = SettingsHelper.get_settings(File.join(Dir.pwd, @@secrets[:cloud_services]), env, @@get_settings_options)
 		cloud_service_details = cloud_services[cloud_service_name]
 		raise StandardError, "No details were found for cloud service #{cloud_service_name}" unless cloud_service_details
 		cloud_srv_name = cloud_service_details["name"]

data/lib/quiverstaskrunner/helpers/settingshelper.rb

@@ -8,7 +8,7 @@ module QuiversTaskrunner
 		module_function
 
 		def get_settings(filepath, env={}, options={})
-			verbose = EnvHelper.get_env("verbose") || false
+			verbose = (defined? ARGV) && (!ARGV.nil?) && (!ARGV.empty?) && (ARGV.detect( |x| x == "verbose"))
 			environment = env.is_a?(Hash) ? "defaults" : env
 			file_contents = open(filepath).read
 			YAML.load(ERB.new(file_contents).result).to_hash
@@ -36,17 +36,15 @@ module QuiversTaskrunner
 
 		def get_cli_settings(options={})
 			# Returns a Hash
-			verbose = EnvHelper.get_env("verbose") || false
+			verbose = (defined? ARGV) && (!ARGV.nil?) && (!ARGV.empty?) && (ARGV.detect( |x| x == "verbose"))
 			if verbose
 				puts "ARGV:".colorize(:yellow)
 				puts ARGV
 			end
 			separator = options[:sep] || "="
-			ignore_keys = options[:ignore_keys]
+			ignore_keys = options[:cli_params_black_list]
 			if defined? ARGV && !ARGV.empty?
-				puts ignore_keys
 				ignore_keys_exist = (defined? ignore_keys) && (!ignore_keys.nil?) && (ignore_keys.is_a?(Array)) && (!ignore_keys.empty?)
-				puts ignore_keys_exist
 				filtered_args = 
 					if (ignore_keys_exist)
 						formatted_ignore_keys = ignore_keys.map { |x| "#{x}#{separator}" }

data/lib/quiverstaskrunner/version.rb

@@ -1 +1 @@
-module QuiversTaskrunner
+module QuiversTaskrunner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quiverstaskrunner
 version: !ruby/object:Gem::Version
-  version: 0.1.254104
+  version: 0.1.254172
 platform: ruby
 authors:
 - ndao