hako 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0cc680f33d2f80eed9ad5382ffe32075894a54b
-  data.tar.gz: c1c79b446727c880bdf9e37a8e56f5b1bc690e44
+  metadata.gz: 44168c92adc956e117f59a47a63eeab9479288d0
+  data.tar.gz: 8dc7fbc348b50f6ea2194e2e2adb6a9802258e89
 SHA512:
-  metadata.gz: 0f00ead195423c3db231323b7403c3d8ec7adf16ad140da95a33ee8ce84bae8ec7529b21572148a66d3e583c7b8bb456d5d102b5f063df7d6a3bb37be0807f73
-  data.tar.gz: 879ad5e2940302f60211b27b8ef644a263d4ae4601db50f347e536de5e5ccb349bc8a22e827a089466bd362bdabd45f5df741ef73eb5a2197bbeb89c577e4e45
+  metadata.gz: 8a2cf60847f746fcc21a7c2b84c74898239d7b8d8b85a950491d01f9e367dcc8b7a5667279e6a1378c71a35a14e455a5613601d896e482b874cfe670d832d3bb
+  data.tar.gz: f39fcc090dac6613a3c6886582841bee8226a926da2d0ea1a63c231ba80d25d45f4ce5192af2def86cc52521e3722beeada382b8713bca5bc281dae7ca401c98

data/examples/front.yml

@@ -1,7 +1,4 @@
-type: nginx
-image_tag: hako-nginx
-memory: 32
-cpu: 32
+type: nginx_front
 s3:
   region: ap-northeast-1
   bucket: nanika

data/examples/hello-lb.yml

@@ -25,8 +25,11 @@ app:
     PORT: 3000
     MESSAGE: '#{username}-san'
 front:
-  <<: !include front.yml
-  extra:
+  image_tag: hako-nginx
+  memory: 32
+  cpu: 32
+scripts:
+  - <<: !include front.yml
     locations:
       /:
         allow_only_from:

data/examples/hello.yml

@@ -17,9 +17,13 @@ app:
     PORT: 3000
     MESSAGE: '#{username}-san'
 front:
-  !include front.yml
+  image_tag: hako-nginx
+  memory: 32
+  cpu: 32
 additional_containers:
   redis:
     image_tag: redis:3.0
     cpu: 64
     memory: 512
+scripts:
+  - !include front.yml

data/lib/hako/container.rb

@@ -18,6 +18,7 @@ module Hako
       cpu
       memory
       links
+      port_mappings
     ].each do |name|
       define_method(name) do
         @definition[name]
@@ -29,7 +30,7 @@ module Hako
     end
 
     def env
-      @expanded_env ||= expand_env(@definition.fetch('env', {}))
+      @expanded_env ||= expand_env(@definition.fetch('env'))
     end
 
     def mount_points
@@ -65,9 +66,11 @@ module Hako
 
     def default_config
       {
+        'env' => {},
         'docker_labels' => {},
         'links' => [],
         'mount_points' => [],
+        'port_mappings' => [],
       }
     end
 

data/lib/hako/definition_loader.rb

@@ -2,7 +2,6 @@
 require 'set'
 require 'hako/app_container'
 require 'hako/container'
-require 'hako/fronts'
 require 'hako/loader'
 
 module Hako
@@ -39,7 +38,7 @@ module Hako
             when 'app'
               AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag), dry_run: @dry_run)
             when 'front'
-              load_front(@app.yaml['front'], dry_run: @dry_run)
+              Container.new(@app, @app.yaml.fetch('front'), dry_run: @dry_run)
             else
               Container.new(@app, additional_containers.fetch(name), dry_run: @dry_run)
             end
@@ -52,9 +51,5 @@ module Hako
       end
       containers
     end
-
-    def load_front(yaml, dry_run:)
-      Loader.new(Hako::Fronts, 'hako/fronts').load(yaml.fetch('type')).new(@app, yaml, dry_run: dry_run)
-    end
   end
 end

data/lib/hako/scheduler.rb

@@ -30,17 +30,6 @@ module Hako
       raise NotImplementedError
     end
 
-    def upload_front_config(app_id, front, app_port)
-      front_conf = front.generate_config(app_port)
-      s3_config = front.s3
-      s3 = Aws::S3::Client.new(region: s3_config.region)
-      s3.put_object(
-        body: front_conf,
-        bucket: s3_config.bucket,
-        key: s3_config.key(app_id),
-      )
-    end
-
     private
 
     def validation_error!(message)

data/lib/hako/schedulers/ecs.rb

@@ -26,11 +26,9 @@ module Hako
       end
 
       def deploy(containers)
-        app = containers.fetch('app')
-        front = containers.fetch('front')
         front_port = determine_front_port
         @scripts.each { |script| script.deploy_started(containers, front_port) }
-        definitions = create_definitions(containers, front_port)
+        definitions = create_definitions(containers)
 
         if @dry_run
           definitions.each do |d|
@@ -43,8 +41,6 @@ module Hako
             task_definition = @ecs.describe_task_definition(task_definition: @app_id).task_definition
           else
             Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
-            upload_front_config(@app_id, front, app.port)
-            Hako.logger.debug "Uploaded front configuration to s3://#{front.s3.bucket}/#{front.s3.key(@app_id)}"
           end
           service = create_or_update_service(task_definition.task_definition_arn, front_port)
           if service == :noop
@@ -58,7 +54,7 @@ module Hako
       end
 
       def oneshot(containers, commands, env)
-        definitions = create_definitions(containers, -1)
+        definitions = create_definitions(containers)
         definitions.each do |definition|
           definition.delete(:essential)
         end
@@ -273,14 +269,9 @@ module Hako
         end
       end
 
-      def create_definitions(containers, front_port)
+      def create_definitions(containers)
         containers.map do |name, container|
-          case name
-          when 'front'
-            front_container(container, front_port)
-          else
-            app_container(name, container)
-          end
+          create_definition(name, container)
         end
       end
 
@@ -306,35 +297,19 @@ module Hako
         end
       end
 
-      def front_container(front, front_port)
-        environment = front.env.map { |k, v| { name: k, value: v } }
-        {
-          name: 'front',
-          image: front.image_tag,
-          cpu: front.cpu,
-          memory: front.memory,
-          links: front.links,
-          port_mappings: [{ container_port: 80, host_port: front_port, protocol: 'tcp' }],
-          essential: true,
-          environment: environment,
-          docker_labels: front.docker_labels,
-          mount_points: front.mount_points,
-        }
-      end
-
-      def app_container(name, app)
-        environment = app.env.map { |k, v| { name: k, value: v } }
+      def create_definition(name, container)
+        environment = container.env.map { |k, v| { name: k, value: v } }
         {
           name: name,
-          image: app.image_tag,
-          cpu: app.cpu,
-          memory: app.memory,
-          links: app.links,
-          port_mappings: [],
+          image: container.image_tag,
+          cpu: container.cpu,
+          memory: container.memory,
+          links: container.links,
+          port_mappings: container.port_mappings,
           essential: true,
           environment: environment,
-          docker_labels: app.docker_labels,
-          mount_points: app.mount_points,
+          docker_labels: container.docker_labels,
+          mount_points: container.mount_points,
         }
       end
 

data/lib/hako/scripts/nginx_front.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+require 'aws-sdk'
+require 'erb'
+require 'hako'
+require 'hako/script'
+
+module Hako
+  module Scripts
+    class NginxFront < Script
+      S3Config = Struct.new(:region, :bucket, :prefix) do
+        def initialize(options)
+          self.region = options.fetch('region')
+          self.bucket = options.fetch('bucket')
+          self.prefix = options.fetch('prefix', nil)
+        end
+
+        def key(app_id)
+          if prefix
+            "#{prefix}/#{app_id}.conf"
+          else
+            "#{app_id}.conf"
+          end
+        end
+      end
+
+      def deploy_starting(containers)
+        front = containers.fetch('front')
+        front.definition['env'].merge!(
+          'AWS_DEFAULT_REGION' => @s3.region,
+          'S3_CONFIG_BUCKET' => @s3.bucket,
+          'S3_CONFIG_KEY' => @s3.key(@app.id),
+        )
+        front.links << link_app
+      end
+
+      def deploy_started(containers, front_port)
+        app = containers.fetch('app')
+        front = containers.fetch('front')
+        front.definition['port_mappings'] << port_mapping(front_port)
+        upload_config(generate_config(app.port))
+        Hako.logger.debug "Uploaded front configuration to s3://#{@s3.bucket}/#{@s3.key(@app.id)}"
+      end
+
+      private
+
+      def configure(options)
+        super
+        @options = options
+        @s3 = S3Config.new(@options.fetch('s3'))
+      end
+
+      def link_app
+        'app:app'
+      end
+
+      def port_mapping(front_port)
+        { container_port: 80, host_port: front_port, protocol: 'tcp' }
+      end
+
+      def generate_config(app_port)
+        Generator.new(@options, app_port).render
+      end
+
+      def upload_config(front_conf)
+        s3_client.put_object(
+          body: front_conf,
+          bucket: @s3.bucket,
+          key: @s3.key(@app.id),
+        )
+      end
+
+      def s3_client
+        @s3_client ||= Aws::S3::Client.new(region: @s3.region)
+      end
+
+      class Generator
+        def initialize(options, app_port)
+          @options = options
+          @app_port = app_port
+        end
+
+        def render
+          ERB.new(File.read(nginx_conf_erb), nil, '-').result(binding)
+        end
+
+        private
+
+        def listen_spec
+          "app:#{@app_port}"
+        end
+
+        def templates_directory
+          File.expand_path('../../templates', __FILE__)
+        end
+
+        def nginx_conf_erb
+          File.join(templates_directory, 'nginx.conf.erb')
+        end
+
+        def nginx_location_conf_erb
+          File.join(templates_directory, 'nginx.location.conf.erb')
+        end
+
+        def locations
+          locs = @options.fetch('locations', {}).dup
+          locs['/'] ||= {}
+          locs.keys.each do |k|
+            locs[k] = Location.new(locs[k])
+          end
+          locs
+        end
+
+        def client_max_body_size
+          @options.fetch('client_max_body_size', nil)
+        end
+
+        def render_location(listen_spec, location)
+          ERB.new(File.read(nginx_location_conf_erb), nil, '-').result(binding).each_line.map do |line|
+            "    #{line}"
+          end.join('')
+        end
+
+        class Location
+          def initialize(config)
+            @config = config
+          end
+
+          def allow_only_from
+            allow = @config.fetch('allow_only_from', nil)
+            if allow
+              allow.flatten
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -116,9 +116,6 @@ files:
 - lib/hako/env_providers.rb
 - lib/hako/env_providers/file.rb
 - lib/hako/error.rb
-- lib/hako/front.rb
-- lib/hako/fronts.rb
-- lib/hako/fronts/nginx.rb
 - lib/hako/loader.rb
 - lib/hako/scheduler.rb
 - lib/hako/schedulers.rb
@@ -128,6 +125,7 @@ files:
 - lib/hako/schedulers/ecs_elb.rb
 - lib/hako/script.rb
 - lib/hako/scripts.rb
+- lib/hako/scripts/nginx_front.rb
 - lib/hako/templates/nginx.conf.erb
 - lib/hako/templates/nginx.location.conf.erb
 - lib/hako/version.rb

data/lib/hako/front.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-require 'hako/container'
-
-module Hako
-  class Front < Container
-    S3Config = Struct.new(:region, :bucket, :prefix) do
-      def initialize(options)
-        self.region = options.fetch('region')
-        self.bucket = options.fetch('bucket')
-        self.prefix = options.fetch('prefix', nil)
-      end
-
-      def key(app_id)
-        if prefix
-          "#{prefix}/#{app_id}.conf"
-        else
-          "#{app_id}.conf"
-        end
-      end
-    end
-
-    attr_reader :s3
-
-    def initialize(*)
-      super
-      @s3 = S3Config.new(@definition.fetch('s3'))
-    end
-
-    def env
-      super.merge(
-        'AWS_DEFAULT_REGION' => @s3.region,
-        'S3_CONFIG_BUCKET' => @s3.bucket,
-        'S3_CONFIG_KEY' => @s3.key(@app.id),
-      )
-    end
-
-    DEFAULT_LINK = ['app:app'].freeze
-
-    def links
-      DEFAULT_LINK + super
-    end
-
-    def extra
-      @definition.fetch('extra', {})
-    end
-
-    def generate_config(_app_port)
-      raise NotImplementedError
-    end
-  end
-end

data/lib/hako/fronts.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-module Hako
-  module Fronts
-  end
-end

data/lib/hako/fronts/nginx.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-require 'erb'
-require 'hako/front'
-
-module Hako
-  module Fronts
-    class Nginx < Front
-      def generate_config(app_port)
-        listen_spec = "app:#{app_port}"
-        ERB.new(File.read(nginx_conf_erb), nil, '-').result(binding)
-      end
-
-      private
-
-      def templates_directory
-        File.expand_path('../../templates', __FILE__)
-      end
-
-      def nginx_conf_erb
-        File.join(templates_directory, 'nginx.conf.erb')
-      end
-
-      def nginx_location_conf_erb
-        File.join(templates_directory, 'nginx.location.conf.erb')
-      end
-
-      def locations
-        locs = extra.fetch('locations', {}).dup
-        locs['/'] ||= {}
-        locs.keys.each do |k|
-          locs[k] = Location.new(locs[k])
-        end
-        locs
-      end
-
-      def client_max_body_size
-        extra.fetch('client_max_body_size', nil)
-      end
-
-      def render_location(listen_spec, location)
-        ERB.new(File.read(nginx_location_conf_erb), nil, '-').result(binding).each_line.map do |line|
-          "    #{line}"
-        end.join('')
-      end
-
-      class Location
-        def initialize(config)
-          @config = config
-        end
-
-        def allow_only_from
-          allow = @config.fetch('allow_only_from', nil)
-          if allow
-            allow.flatten
-          end
-        end
-      end
-    end
-  end
-end