hako 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb1bf796a54d7417e7f17bc3ff04a9fee504b4a7ad93a2ef40a7d3e8e12aa24
-  data.tar.gz: 5c00e175b2e6e4868923966cd85193a56784f8863c90c0a36bd077ad538fd0a1
+  metadata.gz: 767220800b5dfd1061a252661ffbcbc906add32e8530ff6a995c0a7bd0ca8638
+  data.tar.gz: 2e55c3884f6fffd16c1be7c11d4d88bf25e92f8673d8879fe07bd0453fb60fb4
 SHA512:
-  metadata.gz: d2ddc3d4a5b056fd2a2bfa2ac4bc81149ede6ef93310b5d1575c46e40faf7ca1c635ec20441fac1739d4d1212e1e002f4d88d0b390f7f255c3997ccecc8f51d6
-  data.tar.gz: 81c559831ad9fbd2f46ae4e7596b92677c76e0bbe103c6d767d9745033409499854501254ddab16a14e8e223715067245dc8f1f1b9ebf820d873c07e89565a7c
+  metadata.gz: 240ca907d82750a600bcb21b94df017fc4b10732b78ede4e0025042957a0b0eadb3636512a0a4c0fdb59cff31ebb0e541da067397bad6a8da0ffb3a3293cfbec
+  data.tar.gz: c9949c11c16665d5efebe91e92acf30df5ae0c5cdd4d229e0f2b8711e503d5e43267aa233f6830ad6e24fba6f9bc8dbcd4c3a4e4efddb67c31d8861c8558cc4a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.5.0 (2018-11-22)
+## New features
+- Add `load_balancer_name` and `target_group_name` option to skip creating ELB
+- Support ECS secrets
+
 # 2.4.0 (2018-11-13)
 ## New features
 - Support `readonly_root_filesystem` parameter

data/examples/hello-lb-v2.jsonnet

@@ -1,6 +1,3 @@
-local fileProvider = std.native('provide.file');
-local provide(name) = fileProvider(std.toString({ path: 'hello.env' }), name);
-
 {
   scheduler: {
     type: 'ecs',
@@ -48,8 +45,11 @@ local provide(name) = fileProvider(std.toString({ path: 'hello.env' }), name);
     cpu: 256,
     env: {
       PORT: '3000',
-      MESSAGE: std.format('%s-san', provide('username')),
     },
+    secrets: [{
+      name: 'MESSAGE',
+      value_from: 'arn:aws:ssm:ap-northeast-1:012345678901:parameter/hako/hello-lb-v2/secret-message',
+    }],
   },
   sidecars: {
     front: {

data/hako.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-cloudwatch'
   spec.add_dependency 'aws-sdk-cloudwatchlogs'
   spec.add_dependency 'aws-sdk-ec2'
-  spec.add_dependency 'aws-sdk-ecs', '>= 1.7.0'
+  spec.add_dependency 'aws-sdk-ecs', '>= 1.24.0'
   spec.add_dependency 'aws-sdk-elasticloadbalancing'
   spec.add_dependency 'aws-sdk-elasticloadbalancingv2'
   spec.add_dependency 'aws-sdk-s3'

data/lib/hako/container.rb

@@ -46,6 +46,18 @@ module Hako
       @expanded_env ||= expand_env(@definition.fetch('env'))
     end
 
+    # @return [Array<Hash>, nil]
+    def secrets
+      if @definition['secrets']
+        @definition['secrets'].map do |secret|
+          {
+            name: secret.fetch('name'),
+            value_from: secret.fetch('value_from'),
+          }
+        end
+      end
+    end
+
     # @return [Array<Hash>]
     def port_mappings
       @definition['port_mappings'].map do |port_mapping|

data/lib/hako/schedulers/ecs.rb

@@ -155,7 +155,7 @@ module Hako
         task_definition = ecs_client.describe_task_definition(task_definition: current_service.task_definition).task_definition
         current_definition = "#{task_definition.family}:#{task_definition.revision}"
         target_definition = find_rollback_target(task_definition)
-        Hako.logger.info "Current task defintion is #{current_definition}. Rolling back to #{target_definition}"
+        Hako.logger.info "Current task definition is #{current_definition}. Rolling back to #{target_definition}"
         call_rollback_started(task_definition, target_definition)
 
         if @dry_run
@@ -593,6 +593,7 @@ module Hako
           port_mappings: container.port_mappings,
           essential: true,
           environment: environment,
+          secrets: container.secrets,
           docker_labels: container.docker_labels,
           mount_points: container.mount_points,
           command: container.command,
@@ -1198,6 +1199,14 @@ module Hako
             cmd << "\\\n  "
           end
         end
+        (definition[:secrets] || []).each do |secret|
+          name = secret.fetch(:name)
+          # additional_env (given in command line) has priority over secrets (declared in definition file)
+          unless additional_env.key?(name)
+            cmd << '--env' << "#{name}=secret:#{secret.fetch(:value_from)}"
+            cmd << "\\\n  "
+          end
+        end
         additional_env.each do |name, value|
           cmd << '--env' << "#{name}=#{value}"
           cmd << "\\\n  "

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -28,6 +28,7 @@ module Hako
           struct.member(:links, Schema::UnorderedArray.new(Schema::String.new))
           struct.member(:port_mappings, Schema::UnorderedArray.new(port_mapping_schema))
           struct.member(:environment, Schema::UnorderedArray.new(environment_schema))
+          struct.member(:secrets, Schema::Nullable.new(Schema::UnorderedArray.new(secrets_schema)))
           struct.member(:docker_labels, Schema::Table.new(Schema::String.new, Schema::String.new))
           struct.member(:mount_points, Schema::UnorderedArray.new(mount_point_schema))
           struct.member(:command, Schema::Nullable.new(Schema::OrderedArray.new(Schema::String.new)))
@@ -152,6 +153,13 @@ module Hako
           struct.member(:ip_address, Schema::String.new)
         end
       end
+
+      def secrets_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:name, Schema::String.new)
+          struct.member(:value_from, Schema::String.new)
+        end
+      end
     end
   end
 end

data/lib/hako/schedulers/ecs_elb.rb

@@ -99,7 +99,7 @@ module Hako
 
       # @return [String]
       def name
-        "hako-#{@app_id}"
+        @elb_config.fetch('load_balancer_name', "hako-#{@app_id}")
       end
 
       # @return [Hash]

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -31,14 +31,14 @@ module Hako
 
       # @return [Aws::ElasticLoadBalancingV2::Types::LoadBalancer]
       def describe_load_balancer
-        elb_client.describe_load_balancers(names: [name]).load_balancers[0]
+        elb_client.describe_load_balancers(names: [elb_name]).load_balancers[0]
       rescue Aws::ElasticLoadBalancingV2::Errors::LoadBalancerNotFound
         nil
       end
 
       # @return [Aws::ElasticLoadBalancingV2::Types::TargetGroup]
       def describe_target_group
-        elb_client.describe_target_groups(names: [name]).target_groups[0]
+        elb_client.describe_target_groups(names: [target_group_name]).target_groups[0]
       rescue Aws::ElasticLoadBalancingV2::Errors::TargetGroupNotFound
         nil
       end
@@ -57,7 +57,7 @@ module Hako
           elb_type = @elb_v2_config.fetch('type', nil)
           if elb_type == 'network'
             load_balancer = elb_client.create_load_balancer(
-              name: name,
+              name: elb_name,
               subnets: @elb_v2_config.fetch('subnets'),
               scheme: @elb_v2_config.fetch('scheme', nil),
               type: 'network',
@@ -66,7 +66,7 @@ module Hako
             Hako.logger.info "Created ELBv2(NLB) #{load_balancer.dns_name}"
           else
             load_balancer = elb_client.create_load_balancer(
-              name: name,
+              name: elb_name,
               subnets: @elb_v2_config.fetch('subnets'),
               security_groups: @elb_v2_config.fetch('security_groups'),
               scheme: @elb_v2_config.fetch('scheme', nil),
@@ -82,7 +82,7 @@ module Hako
           elb_type = @elb_v2_config.fetch('type', nil)
           target_group = if elb_type == 'network'
                            elb_client.create_target_group(
-                             name: name,
+                             name: target_group_name,
                              port: 80,
                              protocol: 'TCP',
                              vpc_id: @elb_v2_config.fetch('vpc_id'),
@@ -90,7 +90,7 @@ module Hako
                            ).target_groups[0]
                          else
                            elb_client.create_target_group(
-                             name: name,
+                             name: target_group_name,
                              port: 80,
                              protocol: 'HTTP',
                              vpc_id: @elb_v2_config.fetch('vpc_id'),
@@ -203,7 +203,7 @@ module Hako
             Hako.logger.info "Deleted ELBv2 #{load_balancer.load_balancer_arn}"
           end
         else
-          Hako.logger.info "ELBv2 #{name} doesn't exist"
+          Hako.logger.info "ELBv2 #{elb_name} doesn't exist"
         end
 
         target_group = describe_target_group
@@ -232,8 +232,13 @@ module Hako
       end
 
       # @return [String]
-      def name
-        "hako-#{@app_id}"
+      def elb_name
+        @elb_v2_config.fetch('load_balancer_name', "hako-#{@app_id}")
+      end
+
+      # @return [String]
+      def target_group_name
+        @elb_v2_config.fetch('target_group_name', elb_name)
       end
 
       # @return [Hash]

data/lib/hako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hako
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-elasticloadbalancing
   requirement: !ruby/object:Gem::Requirement