hako 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45f04940c4d0ff4ff960ea9619a525085aba342d
-  data.tar.gz: 67610aa17c6877ed84599ecd1be143c4c39d6a03
+  metadata.gz: 3dfc4cedaae2deaccaf4cc32a0f794470f74de82
+  data.tar.gz: 46ede129bf2e3c7a89ce46bf62106e13c7e56b38
 SHA512:
-  metadata.gz: 92407332bca376bcba4e54248842d685568410cf92c4cb19aa7be30d1353a266e549db55da77b3f12c1cc7b5161a78de6edc0e0fc33a2f322822bb937870dbd2
-  data.tar.gz: 2599f5133827e410fb4cc2d068fe7fc09e52b654022f140549ab34abc620cade3bc111dae8c8bb861ec60c89768dc9e6e57eb13b89b8dc929dc50e8a0746d7e9
+  metadata.gz: 02d2c29d73ea3bd2eced9c916e6de1dffa8f0f3c38fb2f9e3dee672e2b1281f61ed9cf37984058a17361980abffe2045f284087fdc7b21173ee86258fa7aec54
+  data.tar.gz: 723a2e83cc6ebf0825a7a4dc08803ed8aef02da28e6c4bb5e35c37885b52fd1060b62a7362e90b831ad527f824fc4d1a6090457949bc0683d0a80c8f3fe814fc

data/examples/hello-lb-v2.yml

@@ -0,0 +1,46 @@
+scheduler:
+  type: ecs
+  region: ap-northeast-1
+  cluster: eagletmt
+  desired_count: 2
+  role: ecsServiceRole
+  # dynamic_port_mapping is enabled by default with elb_v2
+  # dynamic_port_mapping: false
+  elb_v2:
+    # VPC id where the target group is located
+    vpc_id: vpc-WWWWWWWW
+    # Health check path of the target group
+    health_check_path: /site/sha
+    listeners:
+      - port: 80
+        protocol: HTTP
+      - port: 443
+        protocol: HTTPS
+        certificate_arn: arn:aws:iam::012345678901:server-certificate/hello-lb-v2.example.com
+    subnets:
+      - subnet-XXXXXXXX
+      - subnet-YYYYYYYY
+    security_groups:
+      - sg-ZZZZZZZZ
+app:
+  image: ryotarai/hello-sinatra
+  memory: 128
+  cpu: 256
+  env:
+    $providers:
+      - type: file
+        path: hello.env
+    PORT: 3000
+    MESSAGE: '#{username}-san'
+additional_containers:
+  front:
+    image_tag: hako-nginx
+    memory: 32
+    cpu: 32
+scripts:
+  - <<: !include front.yml
+    backend_port: 3000
+    locations:
+      /:
+        allow_only_from:
+          - 10.0.0.0/24

data/examples/hello-lb.yml

@@ -4,6 +4,7 @@ scheduler:
   cluster: eagletmt
   desired_count: 2
   role: ecsServiceRole
+  # dynamic_port_mapping cannot be enabled with elb
   elb:
     listeners:
       - load_balancer_port: 80

data/examples/hello.yml

@@ -4,6 +4,8 @@ scheduler:
   cluster: eagletmt
   desired_count: 2
   task_role_arn: arn:aws:iam::012345678901:role/HelloRole
+  # dynamic_port_mapping is enabled by default with no ELB option
+  # dynamic_port_mapping: false
 app:
   image: ryotarai/hello-sinatra
   memory: 128

data/lib/hako/schedulers/ecs.rb

@@ -5,6 +5,7 @@ require 'hako/error'
 require 'hako/scheduler'
 require 'hako/schedulers/ecs_definition_comparator'
 require 'hako/schedulers/ecs_elb'
+require 'hako/schedulers/ecs_elb_v2'
 require 'hako/schedulers/ecs_autoscaling'
 
 module Hako
@@ -26,6 +27,11 @@ module Hako
         @role = options.fetch('role', nil)
         @task_role_arn = options.fetch('task_role_arn', nil)
         @ecs_elb_options = options.fetch('elb', nil)
+        @ecs_elb_v2_options = options.fetch('elb_v2', nil)
+        if @ecs_elb_options && @ecs_elb_v2_options
+          validation_error!('Cannot specify both elb and elb_v2')
+        end
+        @dynamic_port_mapping = options.fetch('dynamic_port_mapping', @ecs_elb_options.nil?)
         if options.key?('autoscaling')
           @autoscaling = EcsAutoscaling.new(options.fetch('autoscaling'), dry_run: @dry_run)
         end
@@ -154,13 +160,8 @@ module Hako
         end
 
         unless service.load_balancers.empty?
-          lb = service.load_balancers[0]
-          lb_detail = ecs_elb_client.describe_load_balancer
           puts 'Load balancer:'
-          lb_detail.listener_descriptions.each do |ld|
-            l = ld.listener
-            puts "  #{lb_detail.dns_name}:#{l.load_balancer_port} -> #{lb.container_name}:#{lb.container_port}"
-          end
+          ecs_elb_client.show_status(service.load_balancers[0])
         end
 
         puts 'Deployments:'
@@ -245,9 +246,14 @@ module Hako
         @ec2_client ||= Aws::EC2::Client.new(region: @region)
       end
 
-      # @return [EcsElb]
+      # @return [EcsElb, EcsElbV2]
       def ecs_elb_client
-        @ecs_elb_client ||= EcsElb.new(@app_id, Aws::ElasticLoadBalancing::Client.new(region: @region), @ecs_elb_options, dry_run: @dry_run)
+        @ecs_elb_client ||=
+          if @ecs_elb_options
+            EcsElb.new(@app_id, @region, @ecs_elb_options, dry_run: @dry_run)
+          else
+            EcsElbV2.new(@app_id, @region, @ecs_elb_v2_options, dry_run: @dry_run)
+          end
       end
 
       # @return [Aws::ECS::Types::Service, nil]
@@ -260,6 +266,9 @@ module Hako
 
       # @return [Fixnum]
       def determine_front_port
+        if @dynamic_port_mapping
+          return 0
+        end
         if @dry_run
           return DEFAULT_FRONT_PORT
         end
@@ -555,14 +564,9 @@ module Hako
             desired_count: @desired_count,
             role: @role,
           }
-          name = ecs_elb_client.find_or_create_load_balancer(front_port)
-          if name
+          if ecs_elb_client.find_or_create_load_balancer(front_port)
             params[:load_balancers] = [
-              {
-                load_balancer_name: name,
-                container_name: 'front',
-                container_port: 80,
-              },
+              @ecs_elb_client.load_balancer_params_for_service.merge(container_name: 'front', container_port: 80),
             ]
           end
           ecs_client.create_service(params).service

data/lib/hako/schedulers/ecs_elb.rb

@@ -6,47 +6,59 @@ module Hako
   module Schedulers
     class EcsElb
       # @param [String] app_id
-      # @param [Aws::ElasticLoadBalancing::Client] elb
+      # @param [String] region
       # @param [Hash] elb_config
       # @param [Boolean] dry_run
-      def initialize(app_id, elb, elb_config, dry_run:)
+      def initialize(app_id, region, elb_config, dry_run:)
         @app_id = app_id
-        @elb = elb
+        @elb = Aws::ElasticLoadBalancing::Client.new(region: region)
         @elb_config = elb_config
         @dry_run = dry_run
       end
 
+      # @param [Aws::ECS::Types::LoadBalancer] ecs_lb
+      # @return [nil]
+      def show_status(ecs_lb)
+        lb = describe_load_balancer
+        lb.listener_descriptions.each do |ld|
+          l = ld.listener
+          puts "  #{lb.dns_name}:#{l.load_balancer_port} -> #{ecs_lb.container_name}:#{ecs_lb.container_port}"
+        end
+      end
+
       # @return [Aws::ElasticLoadBalancing::Types::LoadBalancerDescription]
       def describe_load_balancer
         @elb.describe_load_balancers(load_balancer_names: [name]).load_balancer_descriptions[0]
       end
 
       # @param [Fixnum] front_port
-      # @return [nil]
+      # @return [Boolean]
       def find_or_create_load_balancer(front_port)
-        if @elb_config
-          unless exist?
-            listeners = @elb_config.fetch('listeners').map do |l|
-              {
-                protocol: l.fetch('protocol'),
-                load_balancer_port: l.fetch('load_balancer_port'),
-                instance_port: front_port,
-                ssl_certificate_id: l.fetch('ssl_certificate_id', nil),
-              }
-            end
-            tags = @elb_config.fetch('tags', {}).map { |k, v| { key: k, value: v.to_s } }
-            lb = @elb.create_load_balancer(
-              load_balancer_name: name,
-              listeners: listeners,
-              subnets: @elb_config.fetch('subnets'),
-              security_groups: @elb_config.fetch('security_groups'),
-              scheme: @elb_config.fetch('scheme', nil),
-              tags: tags.empty? ? nil : tags,
-            )
-            Hako.logger.info "Created ELB #{lb.dns_name} with instance_port=#{front_port}"
+        unless @elb_config
+          return false
+        end
+
+        unless exist?
+          listeners = @elb_config.fetch('listeners').map do |l|
+            {
+              protocol: l.fetch('protocol'),
+              load_balancer_port: l.fetch('load_balancer_port'),
+              instance_port: front_port,
+              ssl_certificate_id: l.fetch('ssl_certificate_id', nil),
+            }
           end
-          name
+          tags = @elb_config.fetch('tags', {}).map { |k, v| { key: k, value: v.to_s } }
+          lb = @elb.create_load_balancer(
+            load_balancer_name: name,
+            listeners: listeners,
+            subnets: @elb_config.fetch('subnets'),
+            security_groups: @elb_config.fetch('security_groups'),
+            scheme: @elb_config.fetch('scheme', nil),
+            tags: tags.empty? ? nil : tags,
+          )
+          Hako.logger.info "Created ELB #{lb.dns_name} with instance_port=#{front_port}"
         end
+        true
       end
 
       # @return [nil]
@@ -75,6 +87,11 @@ module Hako
       def name
         "hako-#{@app_id}"
       end
+
+      # @return [Hash]
+      def load_balancer_params_for_service
+        { load_balancer_name: name }
+      end
     end
   end
 end

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+require 'aws-sdk'
+require 'hako'
+
+module Hako
+  module Schedulers
+    class EcsElbV2
+      # @param [String] app_id
+      # @param [String] region
+      # @param [Hash] elb_v2_config
+      # @param [Boolean] dry_run
+      def initialize(app_id, region, elb_v2_config, dry_run:)
+        @app_id = app_id
+        @elb_v2 = Aws::ElasticLoadBalancingV2::Client.new(region: region)
+        @elb_v2_config = elb_v2_config
+        @dry_run = dry_run
+      end
+
+      # @param [Aws::ECS::Types::LoadBalancer] ecs_lb
+      # @return [nil]
+      def show_status(ecs_lb)
+        lb = describe_load_balancer
+        @elb_v2.describe_listeners(load_balancer_arn: lb.load_balancer_arn).each do |page|
+          page.listeners.each do |listener|
+            puts "  #{lb.dns_name}:#{listener.port} -> #{ecs_lb.container_name}:#{ecs_lb.container_port}"
+          end
+        end
+      end
+
+      # @return [Aws::ElasticLoadBalancingV2::Types::LoadBalancer]
+      def describe_load_balancer
+        @elb_v2.describe_load_balancers(names: [name]).load_balancers[0]
+      rescue Aws::ElasticLoadBalancingV2::Errors::LoadBalancerNotFound
+        nil
+      end
+
+      # @return [Aws::ElasticLoadBalancingV2::Types::TargetGroup]
+      def describe_target_group
+        @elb_v2.describe_target_groups(names: [name]).target_groups[0]
+      rescue Aws::ElasticLoadBalancingV2::Errors::TargetGroupNotFound
+        nil
+      end
+
+      # @param [Fixnum] front_port
+      # @return [nil]
+      def find_or_create_load_balancer(_front_port)
+        unless @elb_v2_config
+          return false
+        end
+
+        load_balancer = describe_load_balancer
+        unless load_balancer
+          tags = @elb_v2_config.fetch('tags', {}).map { |k, v| { key: k, value: v.to_s } }
+          load_balancer = @elb_v2.create_load_balancer(
+            name: name,
+            subnets: @elb_v2_config.fetch('subnets'),
+            security_groups: @elb_v2_config.fetch('security_groups'),
+            scheme: @elb_v2_config.fetch('scheme', nil),
+            tags: tags.empty? ? nil : tags,
+          ).load_balancers[0]
+          Hako.logger.info "Created ELBv2 #{load_balancer.dns_name}"
+        end
+
+        target_group = describe_target_group
+        unless target_group
+          target_group = @elb_v2.create_target_group(
+            name: name,
+            port: 80,
+            protocol: 'HTTP',
+            vpc_id: @elb_v2_config.fetch('vpc_id'),
+            health_check_path: @elb_v2_config.fetch('health_check_path', nil),
+          ).target_groups[0]
+          Hako.logger.info "Created target group #{target_group.target_group_arn}"
+        end
+
+        listener_ports = @elb_v2.describe_listeners(load_balancer_arn: load_balancer.load_balancer_arn).flat_map { |page| page.listeners.map(&:port) }
+        @elb_v2_config.fetch('listeners').each do |l|
+          params = {
+            load_balancer_arn: load_balancer.load_balancer_arn,
+            protocol: l.fetch('protocol'),
+            port: l.fetch('port'),
+            default_actions: [{ type: 'forward', target_group_arn: target_group.target_group_arn }],
+          }
+          certificate_arn = l.fetch('certificate_arn', nil)
+          if certificate_arn
+            params[:certificates] = [{ certificate_arn: certificate_arn }]
+          end
+
+          unless listener_ports.include?(params[:port])
+            listener = @elb_v2.create_listener(params).listeners[0]
+            Hako.logger.info("Created listener #{listener.listener_arn}")
+          end
+        end
+
+        true
+      end
+
+      # @return [nil]
+      def destroy
+        load_balancer = describe_load_balancer
+        if load_balancer
+          if @dry_run
+            Hako.logger.info("@elb_v2.delete_load_balancer(load_balancer_arn: #{load_balancer.load_balancer_arn})")
+          else
+            @elb_v2.delete_load_balancer(load_balancer_arn: load_balancer.load_balancer_arn)
+            Hako.logger.info "Deleted ELBv2 #{load_balancer.load_balancer_arn}"
+          end
+        else
+          Hako.logger.info "ELBv2 #{name} doesn't exist"
+        end
+
+        target_group = describe_target_group
+        if target_group
+          if @dry_run
+            Hako.logger.info("@elb_v2.delete_target_group(target_group_arn: #{target_group.target_group_arn})")
+          else
+            @elb_v2.delete_target_group(target_group_arn: target_group.target_group_arn)
+            Hako.logger.info "Deleted target group #{target_group.target_group_arn}"
+          end
+        end
+      end
+
+      # @return [String]
+      def name
+        "hako-#{@app_id}"
+      end
+
+      # @return [Hash]
+      def load_balancer_params_for_service
+        { target_group_arn: describe_target_group.target_group_arn }
+      end
+    end
+  end
+end

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -116,6 +116,7 @@ files:
 - examples/front.yml
 - examples/hello-autoscaling-group.yml
 - examples/hello-autoscaling.yml
+- examples/hello-lb-v2.yml
 - examples/hello-lb.yml
 - examples/hello.env
 - examples/hello.yml
@@ -140,6 +141,7 @@ files:
 - lib/hako/schedulers/ecs_autoscaling.rb
 - lib/hako/schedulers/ecs_definition_comparator.rb
 - lib/hako/schedulers/ecs_elb.rb
+- lib/hako/schedulers/ecs_elb_v2.rb
 - lib/hako/script.rb
 - lib/hako/scripts.rb
 - lib/hako/scripts/nginx_front.rb