tass 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d590a141e3439e74e93e210bf0ca293e9f00480c
-  data.tar.gz: 54fed348eb8e7aed908d318e4561c489c15b95a2
+  metadata.gz: 79e07e545d00ebfdf7c693c8364c34ff1f34db9f
+  data.tar.gz: c154c83fa1bf2d09c72fdf7d49de63c015f4af01
 SHA512:
-  metadata.gz: bdd2bed48875a84e91c14b90598e72e6852a512d6bb5b6d3ebc5e000af904dd1afda32a0e091ab178e5a50d992bcd254966ba71a48787ad1a30afff39c64ec82
-  data.tar.gz: 15ccdd755734318995c9be67e4df6668345b939df8fb3c2cd2558e5eb8fa23280b41aa3d8adcb20511b2604976274ff703d7dd2af6cd9a3cbd9960cee2fd84d4
+  metadata.gz: 54a540a2fe9185b3e753cb0e978f8d0b6deede19ba571bf084472d5327b8dc369c6bc35dae46539a1546835b8a5acb6efe60dd36a18d3229aa3e9ea26ee8f4e5
+  data.tar.gz: bc8c7c3fd4f818adaa42dacfe375edefa110dfeed526ec0cdb2d88bd7ad11ccbb67d2872919b8ec7979fed8bb21b543464b738555acdc1b0edb962bb6585a3bb

data/bin/tass

@@ -78,6 +78,19 @@ when 'create'
         end
       end
     end
+
+    if config.key?(:asg_metrics)
+      # We list all metrics because otherwise we can't get GroupStandbyInstances
+      Tapjoy::AutoscalingBootstrap::AWS::Autoscaling.client.enable_metrics_collection({
+        auto_scaling_group_name: Tapjoy::AutoscalingBootstrap.scaler_name,
+        metrics: %w(
+          GroupMinSize GroupMaxSize GroupDesiredCapacity GroupInServiceInstances
+          GroupPendingInstances GroupStandbyInstances GroupTerminatingInstances
+          GroupTotalInstances
+        ),
+        granularity: '1Minute'
+      })
+    end
   end
 when 'update'
   opts = Trollop.options do
@@ -96,7 +109,8 @@ when 'update'
   else
     confirm_config(aws_env, config, opts)
 
-    Tapjoy::AutoscalingBootstrap::LaunchConfiguration.new(config, aws_env, user_data)
+    Tapjoy::AutoscalingBootstrap::AutoscalingGroup.new.create(
+      opts, config, aws_env, user_data)
   end
 when 'audit'
   opts = Trollop.options do

data/lib/tapjoy/autoscaling_bootstrap/AWS/Autoscaling/group.rb

@@ -37,7 +37,7 @@ module Tapjoy
               )
             end
 
-            def create(zones:, health_check_type: nil, tags:,
+            def create(zones:, health_check_type: nil, placement_group: nil, tags:,
               vpc_subnets: nil, termination_policies: , **unused_values)
 
               group_hash = {
@@ -47,12 +47,20 @@ module Tapjoy
                 min_size: 0, max_size: 0, desired_capacity: 0,
                 termination_policies: termination_policies,
                 vpc_zone_identifier: vpc_subnets,
+                placement_group: placement_group,
                 tags: Tapjoy::AutoscalingBootstrap::Autoscaling::Group.new.generate_tags(tags)
               }
 
               self.client.create_auto_scaling_group(**group_hash)
             end
 
+            def update_launch_config(scaler_name)
+              self.client.update_auto_scaling_group(
+                auto_scaling_group_name: scaler_name,
+                launch_configuration_name: Tapjoy::AutoscalingBootstrap.config_name,
+              )
+            end
+
             def attach_elb(elb_list)
               self.client.attach_load_balancers({
                 auto_scaling_group_name: Tapjoy::AutoscalingBootstrap.scaler_name,

data/lib/tapjoy/autoscaling_bootstrap/AWS/Autoscaling/launch_config.rb

@@ -16,7 +16,7 @@ module Tapjoy
 
             def create(image_id:, instance_type:, security_groups:, user_data:,
               keypair:, iam_instance_profile:, classic_link_vpc_id: nil,
-              classic_link_sg_ids: nil, **unused_values)
+              classic_link_sg_ids: nil, spot_price: nil, ebs_optimized: true, **unused_values)
 
               self.client.create_launch_configuration(
                 launch_configuration_name: Tapjoy::AutoscalingBootstrap.config_name,
@@ -28,6 +28,8 @@ module Tapjoy
                 key_name: keypair,
                 classic_link_vpc_id: classic_link_vpc_id,
                 classic_link_vpc_security_groups: classic_link_sg_ids,
+                spot_price: spot_price,
+                ebs_optimized: ebs_optimized,
               )
             end
 

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

@@ -16,6 +16,8 @@ module Tapjoy
             )
           end
 
+          ## TODO Call put_scaling_policy based on whether content of YAML and describe_policies are different
+
           def put_scaling_policy(policy_name: policy, scaling_adjustment:,
             cooldown:, **unused_values)
 

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

@@ -34,7 +34,11 @@ module Tapjoy
 
         def delete
           puts "Deleting launch config #{Tapjoy::AutoscalingBootstrap.config_name}"
-          Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::LaunchConfig.delete
+          begin
+            Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::LaunchConfig.delete
+          rescue Aws::AutoScaling::Errors::ResourceInUse
+            puts "Not deleting the existing launch config, because it's currently in use"
+          end
         end
       end
     end

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

@@ -31,9 +31,20 @@ module Tapjoy
           Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::Group.create(**config)
         end
 
+        def update(config:, aws_env:, user_data:)
+          if exists
+            puts "Updating launch config for scaling group: #{@scaler_name}"
+            Tapjoy::AutoscalingBootstrap::LaunchConfiguration.new(config, aws_env, user_data)
+            Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::Group.update_launch_config(@scaler_name)
+            # increment_autoscale_group
+          else
+            abort("Scaling group \"#{@scaler_name}\" doesn't exist, and therefore cannot be updated.")
+          end
+        end
+
         # Check if autoscale group exists
         def exists
-          !Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::Group.describe.nil?
+          Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::Group.describe.nil? ? false : true
         end
 
         # Encode user data into required base64 form

data/lib/tapjoy/autoscaling_bootstrap/configure_autoscaler.rb

@@ -7,7 +7,11 @@ module Tapjoy
 
         if misc_config[:create_as_group]
           sec_group_exists(aws_env[:security_groups]) unless misc_config[:vpc_subnets]
-          create_autoscaling_group(misc_config, aws_env, user_data)
+          if autoscaling_group_exists?
+            update_autoscaling_group(misc_config, aws_env, user_data)
+          else
+            create_autoscaling_group(misc_config, aws_env, user_data)
+          end
         else
           puts 'Skipping creating autoscale group and launch config'
           puts "\n"
@@ -16,6 +20,11 @@ module Tapjoy
 
       private
 
+      # Check if ASG exists so we know whether to create or update
+      def autoscaling_group_exists?
+        Tapjoy::AutoscalingBootstrap::AWS::Autoscaling::Group.describe.nil? ? false : true
+      end
+
       # Check if security group exists and create it if it does not
       def sec_group_exists(groups)
         groups.each do |group|
@@ -35,6 +44,14 @@ module Tapjoy
         Tapjoy::AutoscalingBootstrap.group.create(config: misc_config,
         aws_env: aws_env, user_data: user_data)
       end
+
+      def update_autoscaling_group(misc_config, aws_env, user_data)
+        Tapjoy::AutoscalingBootstrap.group.update(
+          config: misc_config,
+          aws_env: aws_env,
+          user_data: user_data
+        )
+      end
     end
   end
 end

data/lib/tapjoy/autoscaling_bootstrap/launch_configuration.rb

@@ -10,8 +10,12 @@ module Tapjoy
         updated_config = current.to_hash.merge!(new_config)
 
         lc_name = "#{Tapjoy::AutoscalingBootstrap.config_name}_#{date_stamp}"
-        update(config_name: lc_name, user_data: user_data,
-          updated_config: updated_config, aws_env: aws_env)
+        update(
+          config_name: lc_name,
+          scaler_name: Tapjoy::AutoscalingBootstrap.scaler_name,
+          user_data: user_data,
+          updated_config: updated_config, aws_env: aws_env
+        )
       end
 
       def current
@@ -26,16 +30,13 @@ module Tapjoy
 
       def update(config_name:, scaler_name: 'NaS', user_data: user_data,
         updated_config:, aws_env:)
-
         Tapjoy::AutoscalingBootstrap.config_name = config_name
-        Tapjoy::AutoscalingBootstrap.scaler_name = scaler_name
-
         Tapjoy::AutoscalingBootstrap.config.create(updated_config, aws_env,
           user_data)
       end
 
       def date_stamp
-        Time.now.strftime('%Y%m%d-%H%M%S')
+        Time.now.utc.strftime('%Y%m%d-%H%M%S')
       end
     end
   end

data/lib/tapjoy/autoscaling_bootstrap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tass
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -136,6 +136,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: codacy-coverage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TASS is the suite of tools that the Tapjoy Operations team uses to manage
   autoscaling groups and launch configurations.
 email: ali.tayarani@tapjoy.com
@@ -190,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tapjoy Autoscaling Suite