aell 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b9cdfe35653662f3cf6138a6774aa262ba50d0b9a2e3a04c138b247a07c2c5
-  data.tar.gz: 240d89e6c92569f2cb4dd3d0755cf017cbce6a76a6f3045bf320ab7d92cef7e9
+  metadata.gz: 031b6bea2559754ae447585a7ac017b3c8ade5f7ea26464e965b758dcbecba11
+  data.tar.gz: 49dc4035c5c1c15355a9c992516f1111ee5e7e58af03c0b71e12e718bcfc5eb7
 SHA512:
-  metadata.gz: 480f57e121f0eed90a5b084934bbb63ed0dc1e2eb45f092f52d5df9f8ec0ccb46e434dec4747937d940b1c795b666828971461779cabcabd88d52088d93cfa53
-  data.tar.gz: 3065df9c0cae53b6d9a2b63c9a4b15acee5f7a85f3b27df131a50372cc79c2e3390d678122d2a385797d55c033a06da16d88736dd18369a2419918c9fefeb552
+  metadata.gz: 6d06c6be39d5e8b2797810dfe432a98f8d60ccd671f031ecaa32a2884e2aacc85ef1a9f000fed549d1fe271f2fb72997757289d42d2a8e3c6f083646e0e97fe7
+  data.tar.gz: 58059ab781c83dbe6044dbeed83cb0201eb336f17414fd71f640bbd396df8500c36ba64d4486b2b0977e463b2f219bb646a59a9bd09935a8474dd1b3330c8fae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aell (0.1.2)
+    aell (0.2.0)
       aws-sdk-ec2 (~> 1.137)
       net-ssh-multi (~> 1.2.1)
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.267.0)
+    aws-partitions (1.269.0)
     aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -33,7 +33,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -55,8 +55,8 @@ DEPENDENCIES
   aell!
   bundler (~> 1.17)
   pry
-  rake (~> 10.0)
+  rake (>= 12.3.3)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/README.md

@@ -22,20 +22,30 @@ To start using aell you need a `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and
 export AWS_ACCESS_KEY_ID=my_access_key
 export AWS_SECRET_ACCESS_KEY=secret_access_key
 export AWS_REGION=aws_region(eg: us-east-1)
+
+# OPTIONAL (when using MFA)
+export AWS_SESSION_TOKEN=secret_session_token
 ```
 
 Or set with the aell options in each command:
 
 ```bash
-aell - Application:some-app -u deploy-user --access_key_id access_key_id --secret_access_key secret_access_key --region us-east-1 -c 'echo "Hello Aell"'
+aell -t Application:some-app -u deploy-user --access_key_id access_key_id --secret_access_key secret_access_key --region us-east-1 -c 'echo "Hello Aell"'
 ```
+
+Aell can also use aws configuration in ~/.aws/, or use a specific profile with `--profile` option, eg:
+
+
+```bash
+aell --profile my_other_profile -t Application:some-app -u deploy-user -c 'echo "Hello Aell"'
+```
+
 Aell use AWS tags to query the servers with the `-t`/ `--tag` flags, to know more just type `aell -h`
 
 ## TODO
 
- 1. Configure a Docker image
- 2. Separate concerns
- 3. Add specs
+ 1. Separate concerns
+ 2. Add specs
 
 ## Contributing
 

data/aell.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/exe/aell

@@ -6,18 +6,18 @@ require 'aws-sdk-ec2'
 AWS_ACCESS_KEY_ID = ENV['AWS_ACCESS_KEY_ID']
 AWS_SECRET_ACCESS_KEY = ENV['AWS_SECRET_ACCESS_KEY']
 AWS_REGION = ENV['AWS_REGION']
+AWS_SESSION_TOKEN = ENV['AWS_SESSION_TOKEN']
+
+Signal.trap("INT") { exit 2 }
 
 def verify_options!(options)
-u error('Error: Missing user "-u my_user"') unless options[:user]
-  error('Error: Missing tag "-t some_tag:example" or hosts "-h 10.0.0.1,my_domain.intra"') unless options[:tag] || options[:hosts]
-  error('Error: Missing command "-c some_command"') unless options[:command]
-  error('Error: Missing AWS_ACCESS_KEY_ID, set with AWS_ACCESS_KEY_ID environment variable or with  "--access_key_id my_key"') unless options[:access_key_id] || options[:hosts]
-  error('Error: Missing AWS_SECRET_ACCESS_KEY, set with AWS_SECRET_ACCESS_KEY environment variable or with  "--secret_access_key my_key"') unless options[:secret_access_key] || options[:hosts]
-  error('Error: Missing AWS_REGION, set with AWS_REGION environment variable or with  "--region region"') unless options[:region] || options[:hosts]
+  error('Missing user "-u my_user"') unless options[:user]
+  error('Missing tag "-t some_tag:example" or hosts "-h 10.0.0.1,my_domain.intra"') unless options[:tag] || options[:hosts]
+  error('Missing command "-c some_command"') unless options[:command]
 end
 
 def error(message)
-  $stderr.puts message
+  $stderr.puts "[ERROR] #{message}"
   exit 1
 end
 
@@ -28,27 +28,38 @@ def parse_tags(tags)
   [tag, parsed_values]
 end
 
-def get_servers_ips(access_key_id, secret_access_key, region, tags)
-  tag, values = parse_tags(tags)
-
-  ec2_client = Aws::EC2::Client.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
+def get_servers_ips(tag:, **aws_options)
+  tag_name, values = parse_tags(tag)
+  ec2_client = Aws::EC2::Client.new(**aws_options.compact)
   ec2 = Aws::EC2::Resource.new(client: ec2_client)
   ec2.instances({
     filters:
       [{
-        name: "tag:#{tag}",
+        name: "tag:#{tag_name}",
         values: values
       }]
     })
   .collect { |i| i.private_ip_address }.compact
+
+rescue Aws::EC2::Errors::AuthFailure, Aws::Errors::Unauthorized => ex
+  error(ex.message)
+rescue Interrupt
+  exit 2
 end
 
 options = {
   access_key_id: AWS_ACCESS_KEY_ID,
   secret_access_key: AWS_SECRET_ACCESS_KEY,
-  region: AWS_REGION
+  session_token: AWS_SESSION_TOKEN,
+  region: AWS_REGION,
 }
 
+class Hash
+  def except(*keys)
+    self.reject { |k,v| keys.include?(k) }
+  end
+end
+
 OptionParser.new do |opts|
   opts.banner = <<-BANNER
 Aell - Run commands in multiple servers querying by your AWS Infrastructure
@@ -92,6 +103,15 @@ BANNER
     options[:region] = region
   end
 
+  opts.on("--profile PROFILE", "Sets the profile (using ~/.aws/credentials), overrides --access_key_id, --secret_access_key, --region, --session_token options and environment variables") do |profile|
+    options[:profile] = profile
+    options.reject! { |k, v| [:access_key_id, :secret_access_key, :region, :session_token].include?(k) }
+  end
+
+  opts.on("--session-token SESSION_TOKEN ", "Sets the session token when using AWS MFA") do |session_token|
+    options[:session_token] = session_token
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -100,7 +120,7 @@ end.parse!
 
 verify_options!(options)
 
-servers = options[:hosts] || get_servers_ips(options[:access_key_id], options[:secret_access_key], options[:region], options[:tag])
+servers = options[:hosts] || get_servers_ips(**options.except(:user, :hosts, :command))
 
 begin
   Thread.report_on_exception = false

data/lib/aell/version.rb

@@ -1,3 +1,3 @@
 module Aell
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aell
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Run commands on multiple servers in your AWS Infrastructure