ec2-api-proxy 0.1.1 → 0.1.2

data/README

@@ -31,7 +31,7 @@ gem install ec2-api-proxy
   expires: 60
   compress: false
   debug: false
-  shell> eapctl set-debug true
+  shell> eapctl debug true
   
   shell> export HTTP_PROXY=localhost:8080
   shell> aws ec2 describe-instances --endpoint-url=http://ec2.ap-northeast-1.amazonaws.com # It does not support HTTPS still

data/bin/eapctl

@@ -11,14 +11,29 @@ COMMAND_NAME = File.basename(__FILE__)
 COMMANDS = {
   'status' => lambda {|server_options|
     h = {}
-    server_options.to_hash.each {|k, v| h[k.to_s] = v }
+    server_options.to_hash.each {|k, v| h[k.to_s.gsub('_', '-')] = v }
     puts YAML.dump(h)
   },
-  'set-expires' => lambda {|server_options, v|
-    server_options[:expires] = v.to_i
+  'expires' => lambda {|server_options, v|
+    if v
+      server_options[:expires] = v.to_i
+    else
+      puts server_options.to_hash[:expires]
+    end
   },
-  'set-debug' => lambda {|server_options, v|
-    server_options[:debug] = !!(/#{Regexp.escape(v)}/i =~ 'true')
+  'use-https' => lambda {|server_options, v|
+    if v
+      server_options[:use_https] = !!(/#{Regexp.escape(v)}/i =~ 'true')
+    else
+      puts server_options.to_hash[:use_https]
+    end
+  },
+  'debug' => lambda {|server_options, v|
+    if v
+      server_options[:debug] = !!(/#{Regexp.escape(v)}/i =~ 'true')
+    else
+      puts server_options.to_hash[:debug]
+    end
   },
 }
 

data/bin/ec2-api-proxy

@@ -18,6 +18,7 @@ ARGV.options do |parser|
     :compress => false,
     :working_dir => '/var',
     :socket => "/var/tmp/#{APP_NAME}.sock",
+    :use_https => false,
     :debug => false,
   }
 
@@ -29,6 +30,7 @@ ARGV.options do |parser|
   parser.on('-n', '--threads=SIZE'       ) {|v| options[:threads]      = v.to_i }
   parser.on('-W', '--working-dir=DIR'    ) {|v| options[:working_dir]  = v      }
   parser.on('-S', '--socket=SOCK_FILE'   ) {|v| options[:socket]       = v      }
+  parser.on('',   '--use-https'          ) {    options[:use_https]    = true   }
   parser.on('',   '--debug'              ) {    options[:debug]        = true   }
 
   help_and_exit = lambda do |v|

data/lib/ec2-api-proxy/constants.rb

@@ -1,2 +1,2 @@
 APP_NAME = 'ec2-api-proxy'
-Version = '0.1.1'
+Version = '0.1.2'

data/lib/ec2-api-proxy/proxy.rb

@@ -52,7 +52,13 @@ module EC2APIProxy
             close_connection_after_writing
           else
             @logger.debug("proxy: cache miss") if @options[:debug]
-            @backend = EM.connect(endpoint.host, endpoint.port, EC2APIProxy::Backend, self, (allow_cache ? key : nil))
+            @backend = EM.connect(
+                         endpoint.host,
+                         @options[:use_https] ? 443 : endpoint.port,
+                         EC2APIProxy::Backend,
+                         self,
+                         allow_cache ? key : nil
+                       )
 
             if @backend.error?
               @logger.error("proxy: backend connection error: #{data.inspect}")

data/lib/ec2-api-proxy/server.rb

@@ -25,6 +25,7 @@ module EC2APIProxy
           :memcached => @@options[:memcached],
           :expires   => @@options[:expires],
           :compress  => @@options[:compress],
+          :use_https => @@options[:use_https],
           :debug     => @@options[:debug],
         }
 
@@ -38,8 +39,7 @@ module EC2APIProxy
         EM.threadpool_size = @@options[:threads] if @@options[:threads]
 
         EM.run {
-          EM.start_server(@@options[:addr], @@options[:port], EC2APIProxy::Proxy,
-            @@control_options)
+          EM.start_server(@@options[:addr], @@options[:port], EC2APIProxy::Proxy, @@control_options)
         }
       end
     end # self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-api-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: