ecs_deploy_cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28217ab4d8ccda5d3a2471d23aae826cbe4656f98b6432a20cfbdd5c384ad2cf
-  data.tar.gz: cccf9283ffe25359864a8a871455981203f1cd7f30c72788e0c12f845f9b40ec
+  metadata.gz: 6c4714117729290e91e7d5869862246b6aee1d023bbeca7681b92620f18dd03e
+  data.tar.gz: e6ddab9870c19af272723491398afd4ca49bf8f647182270ac71c0c3b08aa578
 SHA512:
-  metadata.gz: db6f191a11e22dc5f249b4d93e4e04a4a492d5576384f65282206bee0ab5872dfe033f2f0412632d8780259a1e49c2f52ec44069b297fa681a4ba17f5dbb8438
-  data.tar.gz: a238312dbd603b9be8ea0387f278c60dc1b70465524f70d1c91c5f8567f2c9f9fb7721538f8474d8182120dcd643eb4f144905b09891580ac51d720568a735bc
+  metadata.gz: 7dc1d20820ebf9f6d9c300b8f0f31df44ca256b379d6e84ca10e0c48f120ea566e94a61cb25694462fe03f67ae35b8658e64e0af4d5253ee14a9717c614b2377
+  data.tar.gz: 903942389ab805b9201c46d55562994648bc8102b5ad6bed62770674cc115f39127d482fa8afd405dde058372413ef684d33e52af6509b4e0d4e4f4eab3b07bd

data/lib/ecs_deploy_cli/dsl/container.rb

@@ -56,6 +56,10 @@ module EcsDeployCli
 
       def as_definition
         {
+          cpu: 0,
+          mount_points: [],
+          port_mappings: [],
+          volumes_from: [],
           memory_reservation: nil,
           essential: true
         }.merge(_options)

data/lib/ecs_deploy_cli/runners/diff.rb

@@ -15,27 +15,57 @@ module EcsDeployCli
 
           result = ecs_client.describe_task_definition(task_definition: task_name).to_h
 
-          current = result[:task_definition].except(:revision, :status, :registered_at, :registered_by, :requires_attributes, :task_definition_arn)
+          current = cleanup_source_task(result[:task_definition])
+          definition = cleanup_source_task(definition)
 
           print_diff Hashdiff.diff(current.except(:container_definitions), definition.except(:container_definitions))
 
-          current[:container_definitions].zip(definition[:container_definitions]).each do |a, b|
-            EcsDeployCli.logger.info "Container #{a&.dig(:name) || 'NONE'} <=> #{b&.dig(:name) || 'NONE'}"
+          diff_container_definitions(
+            current[:container_definitions],
+            definition[:container_definitions]
+          )
 
-            print_diff Hashdiff.diff(a, b) if a && b
-          end
           EcsDeployCli.logger.info '---'
         end
       end
 
+      private
+
+      def diff_container_definitions(first, second)
+        first.zip(second).each do |a, b|
+          EcsDeployCli.logger.info "Container #{a&.dig(:name) || 'NONE'} <=> #{b&.dig(:name) || 'NONE'}"
+
+          next if !a || !b
+
+          sort_envs! a
+          sort_envs! b
+
+          print_diff Hashdiff.diff(a.delete_if { |_, v| v.nil? }, b.delete_if { |_, v| v.nil? })
+        end
+      end
+
+      def sort_envs!(definition)
+        return unless definition[:environment]
+
+        definition[:environment].sort_by! { |e| e[:name] }
+      end
+
+      def cleanup_source_task(task)
+        task.except(
+          :revision, :compatibilities, :status, :registered_at, :registered_by,
+          :requires_attributes, :task_definition_arn
+        ).delete_if { |_, v| v.nil? }
+      end
+
       def print_diff(diff)
         diff.each do |(op, path, *values)|
-          if op == '-'
+          case op
+          when '-'
             EcsDeployCli.logger.info "#{op} #{path} => #{values.join(' ')}".colorize(:red)
-          elsif op == '+'
+          when '+'
             EcsDeployCli.logger.info "#{op} #{path} => #{values.join(' ')}".colorize(:green)
           else
-            EcsDeployCli.logger.info "#{op} #{path} => #{values.join(' ')}".colorize(:light_blue)
+            EcsDeployCli.logger.info "#{op} #{path} => #{values.join(' ')}".colorize(:yellow)
           end
         end
       end

data/lib/ecs_deploy_cli/runners/logs.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module EcsDeployCli
+  module Runners
+    class Logs < Base
+      def run!
+        # _, tasks, = @parser.resolve
+
+        # tasks.
+        # cwl_client.
+      end
+    end
+  end
+end

data/lib/ecs_deploy_cli/runners/status.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module EcsDeployCli
+  module Runners
+    class Status < Base
+      def run!(service)
+        services, = @parser.resolve
+
+        services.each do |service_name, service_definition|
+          next if !service.nil? && service != service_name
+
+          # task_definition = _update_task resolved_tasks[service_definition.options[:task]]
+          # task_name = "#{task_definition[:family]}:#{task_definition[:revision]}"
+
+          puts ecs_client.describe_service(
+            cluster: config[:cluster],
+            service: service_name
+          )
+        end
+      end
+    end
+  end
+end

data/lib/ecs_deploy_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EcsDeployCli
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/ecs_deploy_cli/dsl/container_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe EcsDeployCli::DSL::Container do

data/spec/ecs_deploy_cli/dsl/cron_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe EcsDeployCli::DSL::Cron do

data/spec/ecs_deploy_cli/dsl/parser_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe EcsDeployCli::DSL::Parser do

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'rspec'
 require 'ecs_deploy_cli'
-# require 'kaminari-activerecord'
 
 I18n.enforce_available_locales = false
 RSpec::Expectations.configuration.warn_about_potential_false_positives = false
@@ -11,5 +12,3 @@ Dir[File.expand_path('../support/*.rb', __FILE__)].each { |f| require f }
 RSpec.configure do |config|
 
 end
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deploy_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mònade
@@ -164,8 +164,10 @@ files:
 - lib/ecs_deploy_cli/runner.rb
 - lib/ecs_deploy_cli/runners/base.rb
 - lib/ecs_deploy_cli/runners/diff.rb
+- lib/ecs_deploy_cli/runners/logs.rb
 - lib/ecs_deploy_cli/runners/run_task.rb
 - lib/ecs_deploy_cli/runners/ssh.rb
+- lib/ecs_deploy_cli/runners/status.rb
 - lib/ecs_deploy_cli/runners/update_crons.rb
 - lib/ecs_deploy_cli/runners/update_services.rb
 - lib/ecs_deploy_cli/runners/validate.rb
@@ -201,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: A command line interface to make ECS deployments easier