tass 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f9fd0263ef1c15a5e61436732978ec1b6b0e4b7
-  data.tar.gz: 8e67c25a049fdb7e30076b7238cfe06ab49b2196
+  metadata.gz: d590a141e3439e74e93e210bf0ca293e9f00480c
+  data.tar.gz: 54fed348eb8e7aed908d318e4561c489c15b95a2
 SHA512:
-  metadata.gz: bbb7ac261a8cadccafcfa633dd211409b5719f32aa366703408f4cbd5e099569f3e38545d4a4fc309d11634cf6238cd53f2e71f89209ce3609e2d8f7f51ac652
-  data.tar.gz: 0cac35b118d46990c47fcec1d1b471e137273d6c8a11cb4e8595c164d13f40f4638c7065f96ba39b53bfe33c6fd34f6864a53ca125f4fdf25a6b89e55753d931
+  metadata.gz: bdd2bed48875a84e91c14b90598e72e6852a512d6bb5b6d3ebc5e000af904dd1afda32a0e091ab178e5a50d992bcd254966ba71a48787ad1a30afff39c64ec82
+  data.tar.gz: 15ccdd755734318995c9be67e4df6668345b939df8fb3c2cd2558e5eb8fa23280b41aa3d8adcb20511b2604976274ff703d7dd2af6cd9a3cbd9960cee2fd84d4

data/bin/tass

@@ -23,6 +23,13 @@ def configure_environment(opts)
   [config, aws_env, user_data]
 end
 
+# Are we using a newer yaml schema
+def newer_yaml_version?(config)
+  Tapjoy::AutoscalingBootstrap::Base.new.check_yaml_version(config).split(".").first.to_i >= 2
+end
+
+
+
 SUB_COMMANDS = %w(create update audit scale)
 Trollop::options do
   usage '[SUB_COMMAND] [options]'
@@ -46,27 +53,32 @@ when 'create'
 
   config, aws_env, user_data = configure_environment(opts)
 
-  Tapjoy::AutoscalingBootstrap::Base.new.check_clobber(opts, config)
-  unless confirm_config(aws_env, config, opts)
-    abort('Cannot continue if configuration is not correct.  Please fix.')
-  end
-  Tapjoy::AutoscalingBootstrap::AutoscalingGroup.new.create(opts, config, aws_env, user_data)
-
-  if config.key?(:elb)
-    config[:elb].each do |elb|
-      elb.each do |elb_name, elb_config|
-        Tapjoy::AutoscalingBootstrap.elb_name = elb_name
-        elb_hash = {
-          elb_name => config[:default_elb_parameters].merge!(elb[elb_name])
-        }
-
-        Tapjoy::AutoscalingBootstrap::ELB.new(
-          elb_hash, config[:clobber_elb], config[:zones],
-          config[:security_groups])
+  # check the verison of the yaml we are reading, and do the new hotness if we are running v2 or higher
+  if newer_yaml_version?(config)
+    # TODO: Implement new yaml parsing routine for cloudfront
+    puts "Running new parsing routine with:\nconfig: #{config}\naws_env: #{aws_env}\nuser_data: #{user_data}"
+  else
+    Tapjoy::AutoscalingBootstrap::Base.new.check_clobber(opts, config)
+    unless confirm_config(aws_env, config, opts)
+      abort('Cannot continue if configuration is not correct.  Please fix.')
+    end
+    Tapjoy::AutoscalingBootstrap::AutoscalingGroup.new.create(opts, config, aws_env, user_data)
+
+    if config.key?(:elb)
+      config[:elb].each do |elb|
+        elb.each do |elb_name, elb_config|
+          Tapjoy::AutoscalingBootstrap.elb_name = elb_name
+          elb_hash = {
+            elb_name => config[:default_elb_parameters].merge!(elb[elb_name])
+          }
+
+          Tapjoy::AutoscalingBootstrap::ELB.new(
+            elb_hash, config[:clobber_elb], config[:zones],
+            config[:security_groups])
+        end
       end
     end
   end
-
 when 'update'
   opts = Trollop.options do
     # Set help message
@@ -76,9 +88,16 @@ when 'update'
   end
 
   config, aws_env, user_data = configure_environment(opts)
-  confirm_config(aws_env, config, opts)
 
-  Tapjoy::AutoscalingBootstrap::LaunchConfiguration.new(config, aws_env, user_data)
+  # check the verison of the yaml we are reading, and do the new hotness if we are running v2 or higher
+  if newer_yaml_version?(config)
+    # TODO: Implement new yaml parsing routine for cloudfront
+    puts "Running new parsing routine with:\nconfig: #{config}\naws_env: #{aws_env}\nuser_data: #{user_data}"
+  else
+    confirm_config(aws_env, config, opts)
+
+    Tapjoy::AutoscalingBootstrap::LaunchConfiguration.new(config, aws_env, user_data)
+  end
 when 'audit'
   opts = Trollop.options do
     usage 'audit'
@@ -88,8 +107,14 @@ when 'audit'
 
   config, aws_env, user_data = configure_environment(opts)
 
-  config.merge!(aws_env.merge(user_data: Base64.encode64("#{user_data}")))
-  Tapjoy::AutoscalingBootstrap::Audit.new(config)
+  # check the verison of the yaml we are reading, and do the new hotness if we are running v2 or higher
+  if newer_yaml_version?(config)
+    # TODO: Implement new yaml parsing routine for cloudfront
+    puts "Running new parsing routine with:\nconfig: #{config}\naws_env: #{aws_env}\nuser_data: #{user_data}"
+  else
+    config.merge!(aws_env.merge(user_data: Base64.encode64("#{user_data}")))
+    Tapjoy::AutoscalingBootstrap::Audit.new(config)
+  end
 when 'scale'
   opts = Trollop.options do
     usage 'scale [options]'
@@ -99,7 +124,13 @@ when 'scale'
   end
 
   config, aws_env, user_data = configure_environment(opts)
-  Tapjoy::AutoscalingBootstrap::Autoscaling::Group.new.scale(config)
+  # check the verison of the yaml we are reading, and do the new hotness if we are running v2 or higher
+  if newer_yaml_version?(config)
+    # TODO: Implement new yaml parsing routine for cloudfront
+    puts "This command will be covered by #update functionality in the v2 schema"
+  else
+    Tapjoy::AutoscalingBootstrap::Autoscaling::Group.new.scale(config)
+  end
 else
   Trollop.educate
 end

data/lib/tapjoy/autoscaling_bootstrap/autoscaling/group.rb

@@ -29,7 +29,6 @@ module Tapjoy
 
           puts "Creating scaling group: #{@scaler_name}"
           Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::Group.create(**config)
-          create_termination_notification(config)
         end
 
         # Check if autoscale group exists

data/lib/tapjoy/autoscaling_bootstrap/version.rb

@@ -3,7 +3,7 @@ module Tapjoy
     module Version
       MAJOR = 1
       MINOR = 0
-      PATCH = 1
+      PATCH = 2
     end
 
     VERSION = [Version::MAJOR, Version::MINOR, Version::PATCH].join('.')

data/lib/tapjoy/autoscaling_bootstrap.rb

@@ -111,6 +111,12 @@ module Tapjoy
         create_as_group && Tapjoy::AutoscalingBootstrap.group.exists && !clobber_as
       end
 
+      # See what version of the yaml we are running
+      def check_yaml_version(config)
+        # If we don't have one specified assume v1
+        config[:version] ? config[:version] : "1.0.0"
+      end
+
       # Get AWS Environment
       def get_security_groups(config_dir, env, group)
 
@@ -168,6 +174,9 @@ module Tapjoy
         env_hash      = self.load_yaml(File.join(common_path, "#{env}.yaml"))
 
         new_config = defaults_hash.merge!(env_hash).merge(facet_hash)
+
+        # TODO: Only run this part of the configuration and return aws_env and user_data for the older yaml file verison
+
         new_config[:config_dir] = config_dir
         new_config[:instance_ids] = opts[:instance_ids] if opts.key?(:instance_ids)
         aws_env = self.get_security_groups(common_path, env, new_config[:group])
@@ -177,7 +186,6 @@ module Tapjoy
         new_config[:tags] << {Name: new_config[:name]}
         Tapjoy::AutoscalingBootstrap.scaler_name = "#{new_config[:name]}-group"
         Tapjoy::AutoscalingBootstrap.config_name = "#{new_config[:name]}-config"
-        # If there's no ELB, then Not a ELB
         user_data = self.generate_user_data(userdata_dir,
           new_config[:bootstrap_script], new_config)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tass
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop