hako 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb0e925130947e9060b87f35a2b8f05c5e7ba5e
-  data.tar.gz: 651f08761326f2d6e256adf5a5acdf36536d0a82
+  metadata.gz: f7e905ba26a5f96fbc2aa0e452d7802a6253b293
+  data.tar.gz: eb043950033d3d9367cbfcc57704238fd9a0f645
 SHA512:
-  metadata.gz: b1f0410687bb493c1138be744019ac91b41636d35e451e11f21ad69b3ba142f123cddaadd2c9db722b9b6deceeba9773b21dbd4116dc5a829ef9f30ae1a6292d
-  data.tar.gz: ed716994d7a904addc260be274d883d5c9df09313f0c664975c2c7337f650509e6e2dfaf903446a0606b6d9a8fe8e77f8037386480a0f0b41652a930797525ef
+  metadata.gz: 2b259b71edbdfe3fa4e29894cfcb3d70a4cbbb316943701a511083a065d172398bd29846e1b06d437c315c81a56328631598894bee4abfbfccdf20a4036d544f
+  data.tar.gz: 8b7d739da8bbefb071376e82fec854b96e1b093bf4b24acdec4289e1e364a72c5a666467f8917cf886752be77b28bd7988301889d3cc28441cf40c6bb58f82fe

data/.rubocop.yml

@@ -4,6 +4,9 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3
 
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
 Style/GuardClause:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,6 +1,9 @@
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 

data/examples/create_aws_cloud_watch_logs_log_group.yml

@@ -0,0 +1 @@
+type: create_aws_cloud_watch_logs_log_group

data/examples/hello-awslogs-driver.yml

@@ -14,3 +14,5 @@ app:
       awslogs-group: my-logs
       awslogs-region: ap-northeast-1
       awslogs-stream-prefix: example
+scripts:
+  - <<: !include create_aws_cloud_watch_logs_log_group.yml

data/lib/hako/scheduler.rb

@@ -22,8 +22,7 @@ module Hako
     end
 
     # @param [Hash] _options
-    def configure(_options)
-    end
+    def configure(_options); end
 
     # @param [Hash<String, Container>] _containers
     def deploy(_containers)

data/lib/hako/schedulers/ecs.rb

@@ -3,10 +3,11 @@ require 'aws-sdk'
 require 'hako'
 require 'hako/error'
 require 'hako/scheduler'
+require 'hako/schedulers/ecs_autoscaling'
 require 'hako/schedulers/ecs_definition_comparator'
 require 'hako/schedulers/ecs_elb'
 require 'hako/schedulers/ecs_elb_v2'
-require 'hako/schedulers/ecs_autoscaling'
+require 'hako/schedulers/ecs_service_comparator'
 
 module Hako
   module Schedulers
@@ -565,14 +566,7 @@ module Hako
       # @return [nil]
       def report_container_instance(container_instance_arn)
         container_instance = ecs_client.describe_container_instances(cluster: @cluster, container_instances: [container_instance_arn]).container_instances[0]
-        ec2_client.describe_tags(filters: [{ name: 'resource-id', values: [container_instance.ec2_instance_id] }]).each do |page|
-          tag = page.tags.find { |t| t.key == 'Name' }
-          if tag
-            Hako.logger.info "Container instance is #{container_instance_arn} (#{tag.value} #{container_instance.ec2_instance_id})"
-          else
-            Hako.logger.info "Container instance is #{container_instance_arn} (#{container_instance.ec2_instance_id})"
-          end
-        end
+        Hako.logger.info "Container instance is #{container_instance_arn} (#{container_instance.ec2_instance_id})"
       end
 
       # @param [String] task_definition_arn
@@ -615,23 +609,11 @@ module Hako
         end
       end
 
-      SERVICE_KEYS = %i[desired_count task_definition].freeze
-
       # @param [Aws::ECS::Types::Service] service
       # @param [Hash] params
       # @return [Boolean]
       def service_changed?(service, params)
-        SERVICE_KEYS.each do |key|
-          if service.public_send(key) != params[key]
-            return true
-          end
-        end
-        params[:deployment_configuration].each do |key, val|
-          if val && val != service.deployment_configuration.public_send(key)
-            return true
-          end
-        end
-        false
+        EcsServiceComparator.new(params).different?(service)
       end
 
       # @param [Aws::ECS::Types::Service] service

data/lib/hako/schedulers/ecs_service_comparator.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+require 'hako/schema'
+
+module Hako
+  module Schedulers
+    class EcsServiceComparator
+      def initialize(expected_service)
+        @expected_service = expected_service
+        @schema = service_schema
+      end
+
+      # @param [Aws::ECS::Types::Service] actual_service
+      # @return [Boolean]
+      def different?(actual_service)
+        !@schema.same?(actual_service.to_h, @expected_service)
+      end
+
+      private
+
+      def service_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:desired_count, Schema::Integer.new)
+          struct.member(:task_definition, Schema::String.new)
+          struct.member(:deployment_configuration, Schema::WithDefault.new(deployment_configuration_schema, default_configuration))
+        end
+      end
+
+      def deployment_configuration_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:maximum_percent, Schema::Integer.new)
+          struct.member(:minimum_healthy_percent, Schema::Integer.new)
+        end
+      end
+
+      def default_configuration
+        {
+          maximum_percent: 200,
+          minimum_healthy_percent: 100,
+        }
+      end
+    end
+  end
+end

data/lib/hako/schema/with_default.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Hako
+  module Schema
+    class WithDefault
+      def initialize(schema, default)
+        @schema = schema
+        @default = default
+      end
+
+      def valid?(object)
+        object.nil? || @schema.valid?(object)
+      end
+
+      def same?(x, y)
+        @schema.same?(wrap(x), wrap(y))
+      end
+
+      private
+
+      def wrap(x)
+        x.nil? ? @default : x
+      end
+    end
+  end
+end

data/lib/hako/schema.rb

@@ -7,3 +7,4 @@ require 'hako/schema/string'
 require 'hako/schema/structure'
 require 'hako/schema/table'
 require 'hako/schema/unordered_array'
+require 'hako/schema/with_default'

data/lib/hako/script.rb

@@ -13,37 +13,29 @@ module Hako
     end
 
     # @param [Hash<String, Container>] _containers
-    def deploy_starting(_containers)
-    end
+    def deploy_starting(_containers); end
 
     # @param [Hash<String, Container>] _containers
     # @param [Fixnum] _front_port
-    def deploy_started(_containers, _front_port)
-    end
+    def deploy_started(_containers, _front_port); end
 
     # @param [Hash<String, Container>] _containers
-    def deploy_finished(_containers)
-    end
+    def deploy_finished(_containers); end
 
     # @param [Hash<String, Container>] _containers
-    def oneshot_starting(_containers)
-    end
+    def oneshot_starting(_containers); end
 
     # @param [Scheduler] _scheduler
-    def oneshot_started(_scheduler)
-    end
+    def oneshot_started(_scheduler); end
 
     # @param [Hash<String, Container>] _containers
-    def oneshot_finished(_containers)
-    end
+    def oneshot_finished(_containers); end
 
-    def after_remove
-    end
+    def after_remove; end
 
     private
 
     # @param [Hash] _options
-    def configure(_options)
-    end
+    def configure(_options); end
   end
 end

data/lib/hako/scripts/create_aws_cloud_watch_logs_log_group.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+require 'aws-sdk'
+require 'hako'
+require 'hako/script'
+
+module Hako
+  module Scripts
+    class CreateAwsCloudWatchLogsLogGroup < Script
+      # @param [Hash<String, Container>] containers
+      # @return [nil]
+      def deploy_starting(containers)
+        containers.each_value do |container|
+          log_configuration = container.log_configuration
+          unless log_configuration
+            next
+          end
+
+          if log_configuration[:log_driver] == 'awslogs'
+            create_log_group_if_not_exist(log_configuration.fetch(:options))
+          end
+        end
+      end
+
+      alias_method :oneshot_starting, :deploy_starting
+
+      private
+
+      # @param [Hash] options
+      # @return [nil]
+      def create_log_group_if_not_exist(options)
+        group = options.fetch('awslogs-group')
+        region = options.fetch('awslogs-region')
+
+        unless log_group_exist?(group, region: region)
+          cloudwatch_logs(region).create_log_group(log_group_name: group)
+          Hako.logger.info "Created CloudWatch log group #{group} in #{region}"
+        end
+      end
+
+      # @param [String] region
+      # @return [Aws::CloudWatchLogs::Client]
+      def cloudwatch_logs(region)
+        @cloudwatch_logs ||= {}
+        @cloudwatch_logs[region] ||= Aws::CloudWatchLogs::Client.new(region: region)
+      end
+
+      # @param [String] group
+      # @param [String] region
+      # @return [Boolean]
+      def log_group_exist?(group, region:)
+        cloudwatch_logs(region).describe_log_groups(log_group_name_prefix: group).any? do |page|
+          page.log_groups.any? { |log_group| log_group.log_group_name == group }
+        end
+      end
+    end
+  end
+end

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.21.1'
+  VERSION = '0.22.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -113,6 +113,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/create_aws_cloud_watch_logs_log_group.yml
 - examples/front.yml
 - examples/hello-autoscaling-group.yml
 - examples/hello-autoscaling.yml
@@ -145,6 +146,7 @@ files:
 - lib/hako/schedulers/ecs_definition_comparator.rb
 - lib/hako/schedulers/ecs_elb.rb
 - lib/hako/schedulers/ecs_elb_v2.rb
+- lib/hako/schedulers/ecs_service_comparator.rb
 - lib/hako/schema.rb
 - lib/hako/schema/boolean.rb
 - lib/hako/schema/integer.rb
@@ -154,8 +156,10 @@ files:
 - lib/hako/schema/structure.rb
 - lib/hako/schema/table.rb
 - lib/hako/schema/unordered_array.rb
+- lib/hako/schema/with_default.rb
 - lib/hako/script.rb
 - lib/hako/scripts.rb
+- lib/hako/scripts/create_aws_cloud_watch_logs_log_group.rb
 - lib/hako/scripts/nginx_front.rb
 - lib/hako/templates/nginx.conf.erb
 - lib/hako/templates/nginx.location.conf.erb