hako-switch-hitter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 602c22b719d9246b52f80bb2c3085d230273bb60
-  data.tar.gz: 73a4924dabb8158750b99cc1f21431365a147429
+  metadata.gz: a493b68c2779e1afdf0e2fc80420bb2ae1dc3ca8
+  data.tar.gz: 789bda97be8d7a8bfad32f31805ce38c74f85b13
 SHA512:
-  metadata.gz: 10476b28b50af8918bad76b9068d67fb65381ad2dd13fd4f4b2556ac7c2094bb0e8c4b784b5d23a9440d74b0acf5d14789f6b3b730ade87fcae2312787c40b6f
-  data.tar.gz: ef80d8398d4288f6d3560b1275cc2c454cf5656676235293e7aedcb53e41a50167751711ebb4999cbe1cef3c6bd41aba8810f24f1c41d750e253d7093f97fb15
+  metadata.gz: 95e2b17ba7ab22146d3bfecf5d5148b61192702caeda8e64ca00e6a4c9230adaef45851373c3c8d5f040b8b7b01db1be927088fa6851163ff03f41946d9d2570
+  data.tar.gz: d6121e4a3c8ef75972c19dc70636aab3b6b14aab0bfc8855a0018be397a4c22cd287506e04bc2c5c9a51afea8c8a835c9fc1dbc0e0dfb306daccf609c843c820

data/README.md

@@ -32,12 +32,12 @@ scripts:
 
 config | detail | required
 --- | --- | ---
-proto | http or https | false
-host | example.com | false
+proto | http or https | true
+host | example.com | true
 port | 80 | false
 path | /switch_endpoint | true
 
-If `proto`, `host`, `port` is not configured, hako-switch-hitter will use ELB v2 address.
+If `port` is not configured, hako-switch-hitter will 80 for http and 443 for https.
 
 ## Development
 

data/hako-switch-hitter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hako-switch-hitter'
-  spec.version       = '0.1.1'
+  spec.version       = '0.1.2'
   spec.authors       = ['wata']
   spec.email         = ['wata.gm@gmail.com']
 

data/lib/hako/scripts/switch_hitter.rb

@@ -1,4 +1,3 @@
-require 'aws-sdk'
 require 'hako'
 require 'hako/error'
 require 'hako/script'
@@ -31,26 +30,29 @@ module Hako
 
       # @return [String]
       def endpoint_proto
-        endpoint['proto'] || protocol
+        proto = endpoint.fetch('proto')
+        raise Error.new("Switch hitter proto must be http or https") unless %w/http https/.include?(proto)
+        proto
       end
 
       # @return [String]
       def endpoint_host
-        return endpoint['host'] if endpoint['host']
+        endpoint.fetch('host')
+      end
 
-        load_balancer = describe_load_balancer
-        load_balancer.dns_name
+      # @return [Fixnum]
+      def wellknown_port
+        endpoint_proto == 'https' ? 443 : 80
       end
 
       # @return [Fixnum]
       def endpoint_port
-        endpoint['port'] || port
+        endpoint.fetch('port', wellknown_port)
       end
 
       # @return [String]
       def endpoint_path
-        raise Error.new("Switch hitter path is not configured") unless endpoint['path']
-        endpoint['path']
+        endpoint.fetch('path')
       end
 
       # @return [Net::HTTP]
@@ -58,18 +60,22 @@ module Hako
         Net::HTTP.new(host, port)
       end
 
+      # @return [String]
+      def url
+        "#{endpoint_proto}://#{endpoint_host}:#{endpoint_port}#{endpoint_path}"
+      end
+
       # @return [nil]
       def hit_switch
         net_http = http(endpoint_host, endpoint_port)
 
-        Hako.logger.info("Switch endpoint #{endpoint_proto.downcase}://#{endpoint_host}:#{endpoint_port}#{endpoint_path}")
-        if endpoint_proto.upcase == 'HTTPS'
+        Hako.logger.info("Switch endpoint #{url}")
+        if endpoint_proto == 'HTTPS'
           net_http.use_ssl = true
-          net_http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
 
         if @dry_run
-          Hako.logger.info("Switch hitter will request #{endpoint_proto.downcase}://#{endpoint_host}:#{endpoint_port}#{endpoint_path} [dry-run]")
+          Hako.logger.info("Switch hitter will request #{url} [dry-run]")
           return
         end
 
@@ -82,43 +88,6 @@ module Hako
           Hako.logger.info("Enabled #{endpoint_path} at #{res.body}")
         end
       end
-
-      # @return [String]
-      def region
-        @app.yaml.fetch('scheduler').fetch('region')
-      end
-
-      # @return [Fixnum]
-      def port
-        @app.yaml.fetch('scheduler').fetch('elb_v2').fetch('listeners')[0].fetch('port')
-      end
-
-      # @return [String]
-      def protocol
-        @app.yaml.fetch('scheduler').fetch('elb_v2').fetch('listeners')[0].fetch('protocol')
-      end
-
-      # @return [Aws::ElasticLoadBalancingV2::Client]
-      def elb_v2
-        @elb_v2 ||= Aws::ElasticLoadBalancingV2::Client.new(region: region)
-      end
-
-      # @return [Aws::ElasticLoadBalancingV2::Types::Listener]
-      def describe_listener(load_balancer_arn)
-        elb_v2.describe_listeners(load_balancer_arn: load_balancer_arn).listeners[0]
-      end
-
-      # @return [Aws::ElasticLoadBalancingV2::Types::LoadBalancer]
-      def describe_load_balancer
-        elb_v2.describe_load_balancers(names: [name]).load_balancers[0]
-      rescue Aws::ElasticLoadBalancingV2::Errors::LoadBalancerNotFound
-        nil
-      end
-
-      # @return [String]
-      def name
-        "hako-#{@app.id}"
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako-switch-hitter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - wata