applb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76977cb0b63d4f3572d0ff7af1460ec6116aeb37
-  data.tar.gz: 449a558ea0fa16f405f84a4512feb8b36efcc2e5
+  metadata.gz: 86fee79fad0f566fda95a3cf048d5a46c1a223b8
+  data.tar.gz: 67f3349fb1f006771309674e89ef7f0dd259a38d
 SHA512:
-  metadata.gz: 0cacc6a8c1e732e679de433090dc199a3cef88f35eebecca1a8df0306f9f25c464947dd81d15e3890acaa1ba0a17f51c429de42db1d9e9c134376f15d368891e
-  data.tar.gz: 122a8a8538e0e3efed0d99d52a0ff29b0bb3c7499b7b1eec62c3628d65b8e60c2e460e6f8a724681a3ba7f0661bb63b3aa1d4356feabc75e9b83e8d9e568aa21
+  metadata.gz: 18ffb205d52bc0566cc404ed5fae54a68193b479d4305588967a6ade7bf5370ccf11dea585b135c0ffeb2ef623821d6a0945cece2f0e94956cffc1990059138f
+  data.tar.gz: b8487809f7eadb685e143490516d4c336881b89705926b32b21d3c10ec3e78ab7505250badf270abc2a484aa049b53150f219d85d6e57f193a7a1353c27a872f

data/README.md

@@ -1,6 +1,6 @@
 # Applb
 
-[![Build Status](https://travis-ci.org/wata-gh/applb.svg)](https://travis-ci.org/wata-gh/applb)
+[![Build Status](https://travis-ci.org/codenize-tools/applb.svg)](https://travis-ci.org/codenize-tools/applb)
 
 Applb is a tool to manage ELB v2(ALB).
 It defines the state of ELB v2(ALB) using DSL, and updates ELB v2(ALB) according to DSL.
@@ -238,7 +238,7 @@ end
 
 ## Test
 
-set your AWS arn for [spec/aws_config.yml.sample](https://github.com/wata-gh/applb/blob/master/spec/aws_config.yml.sample) and rename to spec/aws_config.yml.
+set your AWS arn for [spec/aws_config.yml.sample](https://github.com/codenize-tools/applb/blob/master/spec/aws_config.yml.sample) and rename to spec/aws_config.yml.
 
 ## Similar tools
 
@@ -246,7 +246,7 @@ set your AWS arn for [spec/aws_config.yml.sample](https://github.com/wata-gh/app
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/wata-gh/applb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/codenize-tools/applb.
 
 
 ## License

data/applb.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Codenize ELB v2 (ALB)}
   spec.description   = %q{Manage ALB by DSL}
-  spec.homepage      = 'http://github.com/wata-gh/applb'
+  spec.homepage      = 'https://github.com/codenize-tools/applb'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'aws-sdk-elasticloadbalancingv2', '>= 1.6.0'
   spec.add_dependency 'hashie'
   spec.add_dependency 'diffy'
   spec.add_dependency 'term-ansicolor'

data/lib/applb/client.rb

@@ -369,9 +369,9 @@ module Applb
         when 'access_logs.s3.enabled' then
           (result['access_logs'] ||= {s3: {}})[:s3][:enabled] = attr.value
         when 'access_logs.s3.prefix' then
-          result['access_logs'] ||= {s3: {}}[:s3][:prefix] = attr.value
+          (result['access_logs'] ||= {s3: {}})[:s3][:prefix] = attr.value
         when 'access_logs.s3.bucket' then
-          result['access_logs'] ||= {s3: {}}[:s3][:bucket] = attr.value
+          (result['access_logs'] ||= {s3: {}})[:s3][:bucket] = attr.value
         else
           result[attr.key] = attr.value
         end

data/lib/applb/client_wrapper.rb

@@ -1,5 +1,5 @@
 require 'forwardable'
-require 'aws-sdk'
+require 'aws-sdk-elasticloadbalancingv2'
 
 module Applb
   class ClientWrapper
@@ -40,6 +40,7 @@ module Applb
       begin
         resp = @client.describe_target_groups(*argv)
         results.push(*resp.target_groups)
+        next_marker = resp.next_marker
       end while next_marker
       results
     end
@@ -50,6 +51,7 @@ module Applb
       begin
         resp = @client.describe_listeners(*argv)
         results.push(*resp.listeners)
+        next_marker = resp.next_marker
       end while next_marker
       results
     end
@@ -60,6 +62,7 @@ module Applb
       begin
         resp = @client.describe_rules(*argv)
         results.push(*resp.rules)
+        next_marker = resp.next_marker
       end while next_marker
       results
     end

data/lib/applb/dsl/target_group.rb

@@ -11,7 +11,7 @@ module Applb
               ATTRIBUTES = %i/
                 name protocol port vpc_id health_check_protocol health_check_port health_check_path
                 health_check_interval_seconds health_check_timeout_seconds healthy_threshold_count
-                unhealthy_threshold_count matcher
+                unhealthy_threshold_count matcher target_type
               /
 
               attr_accessor *ATTRIBUTES
@@ -43,6 +43,10 @@ module Applb
 
                 Applb.logger.info("Modify target group #{name}")
                 Applb.logger.info("<diff>\n#{Applb::Utils.diff(aws_hash, dsl_hash, color: @options[:color])}")
+                if unmodifiable_attributes_updated?(dsl_hash, aws_hash)
+                  raise 'Can not modify unmodifiable attributes.'
+                end
+
                 return if @options[:dry_run]
 
                 client.modify_target_group(modify_option).target_groups.first
@@ -54,13 +58,24 @@ module Applb
                 to_h
               end
 
-              UNMODIFIABLE_ATTRIBUTES = %i/name port protocol vpc_id/
+              UNMODIFIABLE_ATTRIBUTES = %i/name port protocol vpc_id target_type/
               def modify_option
                 options = to_h.
                   merge(target_group_arn: @aws_tg.target_group_arn).
                   reject! { |k, v| UNMODIFIABLE_ATTRIBUTES.include?(k) }
               end
 
+              def unmodifiable_attributes_updated?(dsl_hash, aws_hash)
+                updated = false
+                UNMODIFIABLE_ATTRIBUTES.each do |n|
+                  if dsl_hash[n] != aws_hash[n]
+                    updated = true
+                    Applb.logger.error("can not modify target_group `#{n}'")
+                  end
+                end
+                updated
+              end
+
               def to_diff_h
                 hash = to_h
                 hash.delete(:target_group_arn)
@@ -85,6 +100,7 @@ module Applb
               @lb_name = lb_name
               @result = Result.new(@context)
               @result.name = name
+              @result.target_type = 'instance' # default value
 
               instance_eval(&block)
             end
@@ -147,6 +163,10 @@ module Applb
             def matcher(http_code:)
               @result.matcher = { http_code: http_code }
             end
+
+            def target_type(target_type)
+              @result.target_type = target_type
+            end
           end
         end
       end

data/lib/applb/version.rb

@@ -1,3 +1,3 @@
 module Applb
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: applb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - wata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-elasticloadbalancingv2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ files:
 - lib/applb/template_helper.rb
 - lib/applb/utils.rb
 - lib/applb/version.rb
-homepage: http://github.com/wata-gh/applb
+homepage: https://github.com/codenize-tools/applb
 licenses:
 - MIT
 metadata: {}
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Codenize ELB v2 (ALB)