hako 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7051366d540062e8a8d89a5e4a29d4fd439e53f9
-  data.tar.gz: de094d094bcc3773b789b3f4fbe12a24a9f64752
+  metadata.gz: 6faa5dea73adc01c789baffd7ecf6823bb86a77f
+  data.tar.gz: 38c6d1baa569e5b4872762b5e6a6fd2e28e11a00
 SHA512:
-  metadata.gz: 41d1331497077ed082ef86164f37b255a9a644444242ef208fb12e4a0301e3934ba63f2d7ec4e90587d286e2c600c46fc13c76b5665260aed3fc77cf367b6b2c
-  data.tar.gz: 812835ac65a95d396687eb2a8314d736e5351099669374f5765ecd9b1688451b9325cf4dc99f0308d4a8062271bbaa9749dc3080e39c27b2641667918d16c5f5
+  metadata.gz: d090b3321ef8fb21bdc24ff19079e30915b067e3555025c9f83ce3dd0377e002c48318bfa525896e92b1c0a16b2bbf404eb3fd3e99b0d62d233afc770943327d
+  data.tar.gz: 4bc41461ca3a40958699833cd99d9b5c0d5108c6e01255a9769919f55520ef4baef4aee2a5a6d86a9b78d4e140356f3df61fa0d480c62562d787697d9d745732

data/examples/hello-lb.yml

@@ -1,16 +1,6 @@
-image: ryotarai/hello-sinatra
-env:
-  $providers:
-    - type: file
-      path: examples/hello.env
-  PORT: 3000
-  MESSAGE: '#{username}-san'
-port: 3000
 scheduler:
   type: ecs
   region: ap-northeast-1
-  memory: 100
-  cpu: 100
   cluster: eagletmt
   desired_count: 2
   role: ecsServiceRole
@@ -23,9 +13,22 @@ scheduler:
       - subnet-YYYYYYYY
     security_groups:
       - sg-ZZZZZZZZ
+app:
+  image: ryotarai/hello-sinatra
+  memory: 100
+  cpu: 100
+  port: 3000
+  env:
+    $providers:
+      - type: file
+        path: examples/hello.env
+    PORT: 3000
+    MESSAGE: '#{username}-san'
 front:
   type: nginx
   image_tag: hako-nginx
+  memory: 100
+  cpu: 100
   s3:
     region: ap-northeast-1
     bucket: nanika

data/examples/hello.yml

@@ -1,21 +1,24 @@
-image: ryotarai/hello-sinatra
-env:
-  $providers:
-    - type: file
-      path: hello.env
-  PORT: 3000
-  MESSAGE: '#{username}-san'
-port: 3000
 scheduler:
   type: ecs
   region: ap-northeast-1
-  memory: 100
-  cpu: 100
   cluster: eagletmt
   desired_count: 2
+app:
+  image: ryotarai/hello-sinatra
+  memory: 100
+  cpu: 100
+  port: 3000
+  env:
+    $providers:
+      - type: file
+        path: hello.env
+    PORT: 3000
+    MESSAGE: '#{username}-san'
 front:
   type: nginx
   image_tag: hako-nginx
+  memory: 100
+  cpu: 100
   s3:
     region: ap-northeast-1
     bucket: nanika

data/lib/hako/app_container.rb

@@ -0,0 +1,13 @@
+require 'hako/container'
+
+module Hako
+  class AppContainer < Container
+    def image_tag
+      "#{@definition['image']}:#{@definition['tag']}"
+    end
+
+    def port
+      @definition['port']
+    end
+  end
+end

data/lib/hako/commander.rb

@@ -1,43 +1,33 @@
-require 'hako/container'
+require 'hako/app_container'
 require 'hako/env_expander'
 require 'hako/error'
-require 'hako/front_config'
 require 'hako/fronts'
+require 'hako/loader'
 require 'hako/schedulers'
 require 'hako/scripts'
 
 module Hako
   class Commander
-    PROVIDERS_KEY = '$providers'.freeze
-
     def initialize(app)
       @app = app
     end
 
     def deploy(force: false, tag: 'latest')
-      env = load_environment(@app.yaml['env'])
+      app = AppContainer.new(@app.yaml['app'].merge('tag' => tag))
       front = load_front(@app.yaml['front'])
       scheduler = load_scheduler(@app.yaml['scheduler'])
-      app_port = @app.yaml.fetch('port', nil)
-      image = @app.yaml.fetch('image') { raise Error.new('image must be set') }
-      app = Container.new(
-        'image_tag' => "#{image}:#{tag}",
-        'docker_labels' => @app.yaml.fetch('docker_labels', {}),
-      )
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config) }
 
       containers = { 'app' => app, 'front' => front }
       scripts.each { |script| script.before_deploy(containers) }
-      scheduler.deploy(containers, env, app_port, force: force)
+      scheduler.deploy(containers, force: force)
       scripts.each { |script| script.after_deploy(containers) }
     end
 
     def oneshot(commands, tag: 'latest')
-      env = load_environment(@app.yaml['env'])
+      app = AppContainer.new(@app.yaml['app'].merge('tag' => tag))
       scheduler = load_scheduler(@app.yaml['scheduler'])
-      image = @app.yaml.fetch('image') { raise Error.new('image must be set') }
-      image_tag = "#{image}:#{tag}"
-      exit scheduler.oneshot(Container.new('image_tag' => image_tag), env, commands)
+      exit scheduler.oneshot(app, commands)
     end
 
     def status
@@ -58,40 +48,16 @@ module Hako
       EnvExpander.new(providers).expand(env)
     end
 
-    def load_providers(provider_configs)
-      provider_configs.map do |config|
-        type = config['type']
-        unless type
-          raise Error.new("type must be set in each #{PROVIDERS_KEY} element")
-        end
-        require "hako/env_providers/#{type}"
-        Hako::EnvProviders.const_get(camelize(type)).new(@app.root_path, config)
-      end
-    end
-
-    def load_scheduler(scheduler_config)
-      type = scheduler_config['type']
-      unless type
-        raise Error.new('type must be set in scheduler')
-      end
-      require "hako/schedulers/#{type}"
-      Hako::Schedulers.const_get(camelize(type)).new(@app.id, scheduler_config)
+    def load_scheduler(yaml)
+      Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml)
     end
 
     def load_front(yaml)
-      front_config = FrontConfig.new(yaml)
-      require "hako/fronts/#{front_config.type}"
-      Hako::Fronts.const_get(camelize(front_config.type)).new(front_config)
-    end
-
-    def load_script(config)
-      type = config.fetch('type')
-      require "hako/scripts/#{type}"
-      Hako::Scripts.const_get(camelize(type)).new(@app, config)
+      Loader.new(Hako::Fronts, 'hako/fronts').load(yaml.fetch('type')).new(@app.id, yaml)
     end
 
-    def camelize(name)
-      name.split('_').map(&:capitalize).join('')
+    def load_script(yaml)
+      Loader.new(Hako::Scripts, 'hako/scripts').load(yaml.fetch('type')).new(@app, yaml)
     end
   end
 end

data/lib/hako/container.rb

@@ -11,6 +11,8 @@ module Hako
     %w[
       image_tag
       docker_labels
+      cpu
+      memory
     ].each do |name|
       define_method(name) do
         @definition[name]
@@ -20,5 +22,25 @@ module Hako
         @definition[name] = val
       end
     end
+
+    def env
+      @expanded_env ||= expand_env(@definition.fetch('env', {}))
+    end
+
+    private
+
+    PROVIDERS_KEY = '$providers'.freeze
+
+    def expand_env(env)
+      env = env.dup
+      providers = load_providers(env.delete(PROVIDERS_KEY) || [])
+      EnvExpander.new(providers).expand(env)
+    end
+
+    def load_providers(provider_configs)
+      provider_configs.map do |yaml|
+        Loader.new(Hako::EnvProviders, 'hako/env_providers').load(yaml.fetch('type')).new(@app.root_path, yaml)
+      end
+    end
   end
 end

data/lib/hako/front.rb

@@ -1,9 +1,41 @@
+require 'hako/container'
+
 module Hako
-  class Front
-    attr_reader :config
+  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(app_id, config)
+      super(config)
+      @app_id = app_id
+      @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
 
-    def initialize(front_config)
-      @config = front_config
+    def extra
+      @definition.fetch('extra', {})
     end
 
     def generate_config(_app_port)

data/lib/hako/fronts/nginx.rb

@@ -24,7 +24,7 @@ module Hako
       end
 
       def locations
-        locs = @config.extra.fetch('locations', {}).dup
+        locs = extra.fetch('locations', {}).dup
         locs['/'] ||= {}
         locs.keys.each do |k|
           locs[k] = Location.new(locs[k])
@@ -33,7 +33,7 @@ module Hako
       end
 
       def client_max_body_size
-        @config.extra.fetch('client_max_body_size', nil)
+        extra.fetch('client_max_body_size', nil)
       end
 
       def render_location(listen_spec, location)

data/lib/hako/loader.rb

@@ -0,0 +1,19 @@
+module Hako
+  class Loader
+    def initialize(base_module, base_path)
+      @base_module = base_module
+      @base_path = base_path
+    end
+
+    def load(name)
+      require "#{@base_path}/#{name}"
+      @base_module.const_get(camelize(name))
+    end
+
+    private
+
+    def camelize(name)
+      name.split('_').map(&:capitalize).join('')
+    end
+  end
+end

data/lib/hako/scheduler.rb

@@ -8,7 +8,7 @@ module Hako
     def initialize(_app_id, _options)
     end
 
-    def deploy(_containers, _env, _app_port, _options)
+    def deploy(_containers, _options)
       raise NotImplementedError
     end
 
@@ -22,7 +22,7 @@ module Hako
 
     def upload_front_config(app_id, front, app_port)
       front_conf = front.generate_config(app_port)
-      s3_config = front.config.s3
+      s3_config = front.s3
       s3 = Aws::S3::Client.new(region: s3_config.region)
       s3.put_object(
         body: front_conf,

data/lib/hako/schedulers/ecs.rb

@@ -14,8 +14,6 @@ module Hako
         @app_id = app_id
         @cluster = options.fetch('cluster', DEFAULT_CLUSTER)
         @desired_count = options.fetch('desired_count') { validation_error!('desired_count must be set') }
-        @cpu = options.fetch('cpu') { validation_error!('cpu must be set') }
-        @memory = options.fetch('memory') { validation_error!('memory must be set') }
         region = options.fetch('region') { validation_error!('region must be set') }
         @role = options.fetch('role', nil)
         @ecs = Aws::ECS::Client.new(region: region)
@@ -23,24 +21,19 @@ module Hako
         @ec2 = Aws::EC2::Client.new(region: region)
       end
 
-      def deploy(containers, env, app_port, force: false)
+      def deploy(containers, force: false)
         @force_mode = force
         app = containers.fetch('app')
         front = containers.fetch('front')
-        front_env = {
-          'AWS_DEFAULT_REGION' => front.config.s3.region,
-          'S3_CONFIG_BUCKET' => front.config.s3.bucket,
-          'S3_CONFIG_KEY' => front.config.s3.key(@app_id),
-        }
         front_port = determine_front_port
-        task_definition = register_task_definition(app, env, front.config, front_env, front_port)
+        task_definition = register_task_definition(containers, front_port)
         if task_definition == :noop
           Hako.logger.info "Task definition isn't changed"
           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.info "Uploaded front configuration to s3://#{front.config.s3.bucket}/#{front.config.s3.key(@app_id)}"
+          upload_front_config(@app_id, front, app.port)
+          Hako.logger.info "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
@@ -52,10 +45,10 @@ module Hako
         Hako.logger.info 'Deployment completed'
       end
 
-      def oneshot(app, env, commands)
+      def oneshot(app, commands)
         task_definition = register_task_definition_for_oneshot(app)
         Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
-        task = run_task(task_definition, env, commands)
+        task = run_task(task_definition, app.env, commands)
         Hako.logger.info "Started task: #{task.task_arn}"
         exit_code = wait_for_task(task)
         Hako.logger.info 'Oneshot task finished'
@@ -197,9 +190,9 @@ module Hako
         EcsDefinitionComparator.new(expected_container).different?(actual_container)
       end
 
-      def register_task_definition(app, env, front_config, front_env, front_port)
-        front_def = front_container(front_config, front_env, front_port)
-        app_def = app_container(app, env)
+      def register_task_definition(containers, front_port)
+        front_def = front_container(containers.fetch('front'), front_port)
+        app_def = app_container(containers.fetch('app'))
         if task_definition_changed?(front_def, app_def)
           @ecs.register_task_definition(
             family: @app_id,
@@ -217,8 +210,8 @@ module Hako
             {
               name: 'oneshot',
               image: app.image_tag,
-              cpu: @cpu,
-              memory: @memory,
+              cpu: app.cpu,
+              memory: app.memory,
               links: [],
               port_mappings: [],
               environment: [],
@@ -227,28 +220,28 @@ module Hako
         ).task_definition
       end
 
-      def front_container(front_config, env, front_port)
-        environment = env.map { |k, v| { name: k, value: v } }
+      def front_container(front, front_port)
+        environment = front.env.map { |k, v| { name: k, value: v } }
         {
           name: 'front',
-          image: front_config.container.image_tag,
-          cpu: 100,
-          memory: 100,
+          image: front.image_tag,
+          cpu: front.cpu,
+          memory: front.memory,
           links: ['app:app'],
           port_mappings: [{ container_port: 80, host_port: front_port, protocol: 'tcp' }],
           essential: true,
           environment: environment,
-          docker_labels: front_config.container.docker_labels,
+          docker_labels: front.docker_labels,
         }
       end
 
-      def app_container(app, env)
-        environment = env.map { |k, v| { name: k, value: v } }
+      def app_container(app)
+        environment = app.env.map { |k, v| { name: k, value: v } }
         {
           name: 'app',
           image: app.image_tag,
-          cpu: @cpu,
-          memory: @memory,
+          cpu: app.cpu,
+          memory: app.memory,
           links: [],
           port_mappings: [],
           essential: true,

data/lib/hako/version.rb

@@ -1,3 +1,3 @@
 module Hako
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -118,6 +118,7 @@ files:
 - exe/hako
 - hako.gemspec
 - lib/hako.rb
+- lib/hako/app_container.rb
 - lib/hako/application.rb
 - lib/hako/cli.rb
 - lib/hako/commander.rb
@@ -128,9 +129,9 @@ files:
 - lib/hako/env_providers/file.rb
 - lib/hako/error.rb
 - lib/hako/front.rb
-- lib/hako/front_config.rb
 - lib/hako/fronts.rb
 - lib/hako/fronts/nginx.rb
+- lib/hako/loader.rb
 - lib/hako/scheduler.rb
 - lib/hako/schedulers.rb
 - lib/hako/schedulers/echo.rb

data/lib/hako/front_config.rb

@@ -1,32 +0,0 @@
-require 'erb'
-require 'hako/container'
-
-module Hako
-  FrontConfig = Struct.new(:type, :container, :s3, :extra)
-  class FrontConfig
-    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 initialize(options)
-      self.type = options.fetch('type')
-      self.container = Container.new(
-        'image_tag' => options.fetch('image_tag'),
-      )
-      self.s3 = S3Config.new(options.fetch('s3'))
-      self.extra = options.fetch('extra', {})
-    end
-  end
-end