rebi 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1335da78cb996e8fae3fc14d605fc2adcb93c3bf
-  data.tar.gz: 7299d451aa9a44d24e642501112fdc9309203a49
+  metadata.gz: 60cb77c8b19d62be65ae7300fa4096365bc6e073
+  data.tar.gz: aebf1f9224a7fc93716df58ce1b0318da92154de
 SHA512:
-  metadata.gz: 7b19c033622bb14b79a04897c1e5a9ec5f80c312ebc86b48ddd9f8bbc06177701d083a82f1db2a1576f405df7ab8a814b6ee99815449ac31d1eedf5250a49449
-  data.tar.gz: 12b99ae8f04ba6f1fe5c1dc375b0e1fd6df75d842d9531e5ab7cf77e647a506d591e5b149a2ae1d0739e015e7ffeec569cf0696551dd156e857e09850b26f05b
+  metadata.gz: edffd486287a4f1f4d8475b9de89a9edab64a8b7eb53e0fb4d895eef147a67f2856e22143b1e3cb7cb296954b43b42422caf54fed5a9b2bbcb928cb481bf125c
+  data.tar.gz: 6cb6b54a0d751f277dc2dbaf179c162262354487a1675708e9bfed7729d47cb917d91a07bed4a71aa73636cb460789bf3745c9b92b76af329e92deea01788178

data/README.md

@@ -8,6 +8,7 @@ Deployment tool for Elasticbeanstalk
   - Multiple deployment
   - Deploy source code along with updating beanstalk options
   - Simple config
+  - Simple ssh
 
 ## Installation
 Or install it yourself as:
@@ -62,6 +63,12 @@ $ bundle exec rebi deploy development web
 $ bundle exec rebi deploy development
 ```
 
+### Ssh
+```bash
+$ bundle exec rebi ssh development web
+```
+
+
 ### Get envronment variables and status
 ```bash
 # Running envronment variables
@@ -78,13 +85,22 @@ $ bundle exec rebi --help
 ```
 
 ### ERB in ebextensions config
-Use `rebi_env` to get environment variables config in .ebextensions
+Use `rebi.env` to get environment variables config in .ebextensions
+```yaml
+# Ex
+# .ebextensions/00-envrionments.config
+option_settings:
+  - option_name: KEY
+    value: <%= rebi.env[KEY] %>
+```
+
+Use `rebi.opts` or `rebi.options` to get options config in .ebextensions
 ```yaml
 # Ex
 # .ebextensions/00-envrionments.config
 option_settings:
   - option_name: KEY
-    value: <%= rebi_env[KEY] %>
+    value: <%= rebi.options.key %>
 ```
 
 ## Contributing

data/bin/rebi

@@ -20,7 +20,7 @@ command :deploy do |c|
   c.description = 'Deploy single or multiple ElasticBeanstalk environments'
   c.example 'Deploy only web environment in development', 'rebi deploy development web'
   c.example 'Deploy all environments in development', 'rebi deploy development'
-  c.option '--source-only', 'Deploy source only'
+  c.option '--include-settings', 'Deploy source and settings'
   c.option '--settings-only', 'Deploy option_settings and environment variables only'
   c.action do |args, options|
     stage, env_name = args
@@ -70,7 +70,7 @@ command :sample do |c|
 end
 
 command :terminate do |c|
-  c.syntax = 'rebi terminate stage env_name '
+  c.syntax = 'rebi terminate stage env_name'
   c.description = 'Terminate environment'
   c.action do |args, options|
     stage, env_name = args
@@ -82,3 +82,23 @@ command :terminate do |c|
     end
   end
 end
+
+command :list do |c|
+  c.syntax = 'rebi list'
+  c.description = "List all environments"
+  c.action do |args, options|
+    Rebi.app.print_list
+  end
+end
+
+command :ssh do |c|
+  c.syntax = 'rebi ssh stage env_name'
+  c.description = "Ssh into instance"
+  c.option '-s','--select', 'Get environment variables from config'
+  c.action do |args, options|
+    stage, env_name = args
+    raise Rebi::Error.new("Stage cannot be nil") if stage.blank?
+    raise Rebi::Error.new("Env name cannot be nil") if env_name.blank?
+    Rebi.app.ssh_interaction stage, env_name, options.__hash__
+  end
+end

data/lib/rebi.rb

@@ -12,6 +12,7 @@ require 'erb'
 require 'ostruct'
 require 'thread'
 require 'thwait'
+require 'subprocess'
 
 require 'rebi/erb_helper'
 require 'rebi/zip_helper'
@@ -20,6 +21,7 @@ require 'rebi/environment'
 require 'rebi/config'
 require 'rebi/config_environment'
 require 'rebi/error'
+require 'rebi/ec2'
 require 'rebi/version'
 
 Dotenv.load
@@ -38,6 +40,14 @@ module Rebi
     @@client = c || Aws::ElasticBeanstalk::Client.new
   end
 
+  def ec2
+    @@ec2_client = Rebi::EC2.new
+  end
+
+  def iam
+    @@iam_client = Aws::IAM::Client.new
+  end
+
   def app
     return Rebi::Application.get_or_create_application(config.app_name)
   end

data/lib/rebi/application.rb

@@ -18,7 +18,7 @@ module Rebi
 
     def deploy stage_name, env_name=nil, opts={}
       return deploy_stage(stage_name, opts) if env_name.blank?
-      env = Rebi::Environment.new stage_name, env_name, client
+      env = get_environment stage_name, env_name
       app_version = create_app_version env
       begin
         req_id = env.deploy app_version, opts
@@ -58,7 +58,7 @@ module Rebi
         return
       end
 
-      env = Rebi::Environment.new stage_name, env_name, client
+      env = get_environment stage_name, env_name
       env_vars = from_config ? env.config.environment_variables : env.environment_variables
 
       Rebi.log("#{from_config ? "Config" : "Current"} environment variables", env.name)
@@ -77,7 +77,7 @@ module Rebi
         return
       end
 
-      env = Rebi::Environment.new stage_name, env_name, client
+      env = get_environment stage_name, env_name
       env.check_created!
       Rebi.log("--------- CURRENT STATUS -------------", env.name)
       Rebi.log("id: #{env.id}", env.name)
@@ -87,7 +87,7 @@ module Rebi
     end
 
     def terminate! stage_name, env_name
-      env = Rebi::Environment.new stage_name, env_name, client
+      env = get_environment stage_name, env_name
       begin
         req_id = env.terminate!
         ThreadsWait.all_waits(env.watch_request req_id) if req_id
@@ -123,6 +123,63 @@ module Rebi
     end
 
 
+    def print_list
+      others = []
+      configed = Hash.new {|h, k| h[k] = {} }
+      environments.each do |e|
+        if env_conf = Rebi.config.env_by_name(e.environment_name)
+          configed[env_conf.stage.to_s].merge! env_conf.env_name.to_s => env_conf.name
+        else
+          others << e.environment_name
+        end
+      end
+
+      configed.each do |stg, envs|
+        Rebi.log "-------------"
+        Rebi.log "#{stg.camelize}:"
+        envs.each do |k, v|
+          Rebi.log "\t#{k.camelize}: #{v}"
+        end
+      end
+
+      if others.present?
+        Rebi.log "-------------"
+        Rebi.log "Others:"
+        others.each do |e|
+          Rebi.log "\t- #{e}"
+        end
+      end
+    end
+
+    def ssh_interaction stage_name, env_name, opts={}
+      env = get_environment stage_name, env_name
+      instance_ids = env.instance_ids
+      return if instance_ids.empty?
+
+      instance_ids.each.with_index do |i,idx|
+        Rebi.log "#{idx+1}) #{i}"
+      end
+
+      instance_id = instance_ids.first
+
+      if instance_ids.count != 1 && opts[:select]
+
+
+        idx = 0
+        while idx < 1 || idx > instance_ids.count
+          idx = ask_for_integer "Select an instance to ssh into:"
+        end
+        instance_id = instance_ids[idx - 1]
+      end
+
+      Rebi.log "Preparing to ssh into [#{instance_id}]"
+      env.ssh instance_id
+    end
+
+    def get_environment stage_name, env_name
+      Rebi::Environment.new stage_name, env_name, client
+    end
+
     def self.client
       Rebi.client || Aws::ElasticBeanstalk::Client.new
     end

data/lib/rebi/config.rb

@@ -37,6 +37,21 @@ module Rebi
       return Rebi::ConfigEnvironment.new(stg_name, env_name, stg[env_name] || {})
     end
 
+    def env_by_name name
+      data[:stages].each do |stg_name, stg_conf|
+        stg = stage stg_name
+        stg_conf.keys.each do |env_name|
+          env_conf = Rebi::ConfigEnvironment.new(stg_name, env_name, stg[env_name] || {})
+          return env_conf if env_conf.name == name
+        end
+      end
+      return nil
+    end
+
+    def stages
+      data[:stages].keys
+    end
+
     private
     def data
       @data ||= YAML::load(ERB.new(IO.read(config_file)).result).with_indifferent_access

data/lib/rebi/config_environment.rb

@@ -12,14 +12,15 @@ module Rebi
                 :instance_type,
                 :instance_num,
                 :key_name,
-                :service_role,
+                :instance_profile,
                 :ebextensions,
                 :solution_stack_name,
                 :cfg_file,
                 :env_file,
                 :environment_variables,
                 :option_settings,
-                :raw_conf
+                :raw_conf,
+                :options
 
     NAMESPACE ={
       app_env: "aws:elasticbeanstalk:application:environment",
@@ -39,6 +40,8 @@ module Rebi
       eb_env: [:ServiceRole],
     }
 
+    DEFAULT_IAM_INSTANCE_PROFILE = "aws-elasticbeanstalk-ec2-role"
+
     def initialize stage, env_name, env_conf={}
       @raw_conf = env_conf.with_indifferent_access
       @stage = stage.to_sym
@@ -107,8 +110,17 @@ module Rebi
       get_opt(ns[:autoscaling_launch], :EC2KeyName)
     end
 
-    def service_role
-      get_opt(ns[:eb_env], :ServiceRole)
+    def instance_profile
+      get_opt(ns[:autoscaling_launch], :IamInstanceProfile)
+    end
+
+    def default_instance_profile?
+      self.instance_profile == DEFAULT_IAM_INSTANCE_PROFILE
+    end
+
+    def options
+      opts = (raw_conf[:options] || {}).with_indifferent_access
+      JSON.parse(opts.to_json, object_class: OpenStruct)
     end
 
     def cfg_file
@@ -133,7 +145,7 @@ module Rebi
     end
 
     def solution_stack_name
-      @solution_stack_name ||= raw_conf[:solution_stack_name] || "64bit Amazon Linux 2017.03 v2.4.1 running Ruby 2.3 (Puma)"
+      @solution_stack_name ||= raw_conf[:solution_stack_name] || "64bit Amazon Linux 2017.09 v2.6.0 running Ruby 2.4 (Puma)"
     end
 
     def platform_arn
@@ -201,7 +213,7 @@ module Rebi
       opt = set_opt_keyname opt
       opt = set_opt_instance_type opt
       opt = set_opt_instance_num opt
-      opt = set_opt_service_role opt
+      opt = set_opt_instance_profile opt
 
       return @opt = opt
     end
@@ -237,17 +249,18 @@ module Rebi
       return opt
     end
 
-    def set_opt_service_role opt
-      s_role = if raw_conf.key?(:service_role)
-        raw_conf[:service_role]
-      elsif role = get_raw_opt(ns[:eb_env], :ServiceRole)
+    def set_opt_instance_profile opt
+      s_role = if raw_conf.key?(:instance_profile)
+        raw_conf[:instance_profile]
+      elsif role = get_raw_opt(ns[:autoscaling_launch], :IamInstanceProfile)
         role
       else
-        'aws-elasticbeanstalk-service-role'
+        DEFAULT_IAM_INSTANCE_PROFILE
       end
+
       if s_role.present?
-        opt[ns[:eb_env]].merge!({
-          ServiceRole: s_role,
+        opt[ns[:autoscaling_launch]].merge!({
+          IamInstanceProfile: s_role,
         }.with_indifferent_access)
       end
       return opt

data/lib/rebi/ec2.rb

@@ -0,0 +1,59 @@
+module Rebi
+  class EC2
+
+    attr_reader :client
+
+    def initialize client=Aws::EC2::Client.new
+      @client = client
+    end
+
+    def describe_instance instance_id
+      res = client.describe_instances instance_ids: [instance_id]
+      return res.reservations.first.instances.first
+    end
+
+    def authorize_ssh instance_id, &blk
+      group_id = describe_instance(instance_id).security_groups.map(&:group_id).sort.first
+
+      my_ip = `dig +short myip.opendns.com @resolver1.opendns.com`.chomp
+      cidr_ip = my_ip.present? ? "#{my_ip}/32" : "0.0.0.0/0"
+
+      begin
+        log "Attempting to open port 22."
+        client.authorize_security_group_ingress({
+          group_id: group_id,
+          ip_protocol: "tcp",
+          to_port: 22,
+          from_port: 22,
+          cidr_ip: cidr_ip
+          })
+        log "SSH port 22 open."
+
+      rescue Aws::EC2::Errors::InvalidPermissionDuplicate
+        log "Opened already"
+      rescue Exception => e
+        raise e
+      end
+
+      yield if block_given?
+
+      ensure
+        begin
+          log "Attempting to close port 22."
+          client.revoke_security_group_ingress({
+            group_id: group_id,
+            ip_protocol: "tcp",
+            to_port: 22,
+            from_port: 22,
+            cidr_ip: cidr_ip
+            })
+        rescue Exception => e
+          raise e
+        end
+    end
+
+    def log mes
+      Rebi.log(mes, "EC2")
+    end
+  end
+end

data/lib/rebi/environment.rb

@@ -143,7 +143,11 @@ module Rebi
         end
         log ("Timeout") unless finished
       end
-      thread.join
+      begin
+        thread.join
+      rescue Interrupt
+        log("Interrupt")
+      end
       return thread
     end
 
@@ -160,9 +164,17 @@ module Rebi
       return self
     end
 
+    def instance_ids
+      resp = client.describe_environment_resources environment_name: self.name
+      resp.environment_resources.instances.map(&:id).sort
+    end
+
     def init version_label, opts={}
       log("Creating new environment")
       start_time = Time.now
+
+      self.check_instance_profile
+
       self.api_data = client.create_environment({
         application_name: config.app_name,
         cname_prefix: config.cname_prefix,
@@ -183,6 +195,7 @@ module Rebi
     end
 
     def update version_label, opts={}
+
       raise Rebi::Error::EnvironmentInUpdating.new(name) if in_updating?
       log("Start updating")
       start_time = Time.now
@@ -192,15 +205,19 @@ module Rebi
         environment_name: config.name,
         version_label: version_label,
         description: config.description,
-        option_settings: deploy_opts[:option_settings],
-        options_to_remove: deploy_opts[:options_to_remove],
       }
 
-      if opts[:source_only]
-        deploy_args.delete(:option_settings)
-        deploy_args.delete(:options_to_remove)
-      elsif opts[:settings_only]
-        deploy_args.delete(:version_label)
+      if opts[:include_settings] || opts[:settings_only]
+        deploy_args.merge!({
+          option_settings: deploy_opts[:option_settings],
+          options_to_remove: deploy_opts[:options_to_remove],
+        })
+        deploy_args.delete(:version_label) if opts[:settings_only]
+      else
+        deploy_args.merge!({
+          option_settings: deploy_opts[:env_only],
+          options_to_remove: deploy_opts[:options_to_remove],
+        })
       end
 
       self.api_data = client.update_environment(deploy_args)
@@ -267,21 +284,104 @@ module Rebi
     def gen_deploy_opts
       to_deploy = []
       to_remove = []
+      env_only = []
       config.opts_array.each do |o|
         o = o.deep_dup
-        if o[:namespace] == config.ns(:app_env) && o[:value].blank?
-          o.delete(:value)
-          to_remove << o
-          next
+
+        if o[:namespace] == config.ns(:app_env)
+          if o[:value].blank?
+            o.delete(:value)
+            to_remove << o
+            next
+          else
+            env_only << o
+          end
         end
         to_deploy << o
       end
       return {
         option_settings: to_deploy,
         options_to_remove:  to_remove,
+        env_only: env_only,
       }
     end
 
+    def ssh instance_id
+      raise "Invalid instance_id" unless self.instance_ids.include?(instance_id)
+
+
+      instance  = Rebi.ec2.describe_instance instance_id
+
+      raise Rebi::Error::EC2NoKey.new unless instance.key_name.present?
+      raise Rebi::Error::EC2NoIP.new unless instance.public_ip_address.present?
+
+
+      Rebi.ec2.authorize_ssh instance_id do
+        user = "ec2-user"
+        key_file = "~/.ssh/#{instance.key_name}.pem"
+        raise Rebi::Error::KeyFileNotFound unless File.exists? File.expand_path(key_file)
+        cmd = "ssh -i #{key_file} #{user}@#{instance.public_ip_address}"
+        log cmd
+
+        begin
+          Subprocess.check_call(['ssh', '-i', key_file,  "#{user}@#{instance.public_ip_address}"])
+        rescue Subprocess::NonZeroExit => e
+          log e.message
+        end
+
+      end
+
+    end
+
+    def check_instance_profile
+      iam = Rebi.iam
+      begin
+        iam.get_instance_profile({
+          instance_profile_name: config.instance_profile
+          })
+        return true
+      rescue Aws::IAM::Errors::NoSuchEntity => e
+        raise e unless config.default_instance_profile?
+        self.create_defaut_profile
+      end
+    end
+
+    def create_defaut_profile
+      iam = Rebi.iam
+      profile = role = Rebi::ConfigEnvironment::DEFAULT_IAM_INSTANCE_PROFILE
+      iam.create_instance_profile({
+        instance_profile_name: profile
+        })
+
+      document = <<-JSON
+{
+  "Version":"2008-10-17",
+  "Statement":[
+      {
+        "Effect":"Allow",
+        "Principal":{
+          "Service":["ec2.amazonaws.com"]
+        },
+        "Action":["sts:AssumeRole"]
+      }
+  ]
+}
+      JSON
+      begin
+        iam.create_role({
+          role_name: role,
+          assume_role_policy_document: document
+          })
+      rescue Aws::IAM::Errors::EntityAlreadyExists
+      end
+
+      iam.add_role_to_instance_profile({
+        instance_profile_name: profile,
+        role_name: role
+        })
+
+    end
+
     def self.create stage_name, env_name, version_label, client
       env =  new stage_name, env_name, client
       raise Rebi::Error::EnvironmentExisted.new if env.created?
@@ -291,7 +391,7 @@ module Rebi
     end
 
     # TODO
-    def self.all client=Rebi.client
+    def self.all app_name, client=Rebi.client
       client.describe_environments(application_name: app_name,
                                    include_deleted: false).environments
     end

data/lib/rebi/erb_helper.rb

@@ -1,14 +1,23 @@
 module Rebi
   class ErbHelper
-    def initialize input, env_vars
+    def initialize input, env_conf
       @input = input
-      @env = env_vars || {}
+      @env = env_conf.environment_variables || {}
+      @options = env_conf.options
     end
 
     def rebi_env k=nil
       k.present? ? @env[k] : @env
     end
 
+    def rebi
+      OpenStruct.new ({
+        env: @env,
+        opts: @options,
+        options: @options,
+        })
+    end
+
     def result
       ERB.new(@input).result(binding)
     end

data/lib/rebi/error.rb

@@ -9,5 +9,9 @@ module Rebi
     NoGit = Class.new(self)
     ServiceError = Class.new(self)
     EnvironmentInUpdating = Class.new(self)
+    EC2NoKey = Class.new(self)
+    EC2NoIP = Class.new(self)
+    KeyFileNotFound = Class.new(self)
+    SSH = Class.new(self)
   end
 end

data/lib/rebi/iam.rb

@@ -0,0 +1,43 @@
+# module Rebi
+#   class IAM
+#
+#     attr_reader :client
+#
+#     def initialize client=Aws::IAM::Client.new
+#       @client = client
+#     end
+#
+#     def check_or_create_eb_profile profile
+#
+#     end
+#
+#     def create_instance_profile profile
+#       clieng.create_instance_profile({
+#         instance_profile_name: profile
+#         })
+#     end
+#
+#     def get_default_role
+#       role = Rebi::ConfigEnvironment::DEFAULT_IAM_INSTANCE_PROFILE
+#       document = '{"Version": "2008-10-17","Statement": [{"Action":' \
+#                  ' "sts:AssumeRole","Principal": {"Service": ' \
+#                  '"ec2.amazonaws.com"},"Effect": "Allow","Sid": ""}]}'
+#       client.create_role({
+#           role_name: role,
+#           assume_role_policy_document: document
+#         })
+#       return role
+#     end
+#
+#     def add_role_to_profile profile, role
+#       client.add_role_to_instance_profile({
+#         instance_profile_name: profile,
+#         role_name: role
+#         })
+#     end
+#
+#     def log mes
+#       Rebi.log(mes, "IAM")
+#     end
+#   end
+# end

data/lib/rebi/version.rb

@@ -1,3 +1,3 @@
 module Rebi
-  VERSION = '0.1.8'
+  VERSION = '0.2.1'
 end

data/lib/rebi/zip_helper.rb

@@ -36,7 +36,7 @@ module Rebi
         ebextensions.each do |ex_folder|
           Dir.glob("#{ex_folder}/*.config") do |fname|
             next unless (File.file?(fname) && files.include?(fname))
-            next unless y = YAML::load(ErbHelper.new(File.read(fname), env_conf.environment_variables).result)
+            next unless y = YAML::load(ErbHelper.new(File.read(fname), env_conf).result)
             basename = File.basename(fname)
             target = ".ebextensions/#{basename}"
             tmp_yaml = "#{tmp_folder}/#{basename}"

data/sample/rebi.yml

@@ -13,8 +13,9 @@ stages: #Required: Hash
         min: 1
         max: 1
       key_name: # Optional, if not set you cannot ssh into ec2 instances
-      service_role: role # Optional, default: aws-elasticbeanstalk-service-role
-      solution_stack_name: Ruby # Optional: default: "64bit Amazon Linux 2017.03 v2.4.1 running Ruby 2.3 (Puma)"
+      instance_profile: iam_profile # Optional, default: aws-elasticbeanstalk-service-role
+                                    # http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/iam-instanceprofile.html
+      solution_stack_name: Ruby # Optional: default: "64bit Amazon Linux 2017.09 v2.6.0 running Ruby 2.4 (Puma)"
       env_file: .env.development # Optional
       environment_variables: # Optional, nil will be deleted when update,
                              # Use `rebi get_env stage --from-config` to get env settings
@@ -32,6 +33,8 @@ stages: #Required: Hash
                                         # Result will has 01.config, 02.config(from web1_extensions) and 03.config
       cfg_file: File path or cfg name   # Optional
 
+      options: #Hash, Other custom options for using in erb
+        use_basic: true # rebi.opts.use_basic
     worker:
       # ...
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rebi
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - KhiemNS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-23 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
+- !ruby/object:Gem::Dependency
+  name: subprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Deploy ElasticBeanstalk with multiple deploy, switchable and dynamic
   generated ebextensions with erb
 email:
@@ -111,9 +125,11 @@ files:
 - lib/rebi/application.rb
 - lib/rebi/config.rb
 - lib/rebi/config_environment.rb
+- lib/rebi/ec2.rb
 - lib/rebi/environment.rb
 - lib/rebi/erb_helper.rb
 - lib/rebi/error.rb
+- lib/rebi/iam.rb
 - lib/rebi/version.rb
 - lib/rebi/zip_helper.rb
 - lib/tasks/rebi.rake