ec2 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 67a8f18079f6dcaab371130b7bb5719adde84853
-  data.tar.gz: 3507f5c9ef4d942386a463aac6561e6d6e9ae98e
+SHA256:
+  metadata.gz: 2ce06d5db805010247dd60126cd580ed9997ebd8ac8ffd3114f79e237da080e6
+  data.tar.gz: be3730bd1a4a2ae4e7fa20d20dff33989cfd66c59c12946cb76b1b83439fd5cd
 SHA512:
-  metadata.gz: 6aba022af5c0fd56b1cdcd944715bf30a60dfe376b4574e89494ff9bfb01d3365b77e36608d5701dd60cc17629c4f131f8b82436d637c57cd88dcff7f31254ff
-  data.tar.gz: 168ded50b3abd14b310a53c3f8afccaa02a5ca195a36e9cc2e61212a1e77be3d0ed9831de08a82f5b85fe7ef454179e562dcddf1a4c5c2689344928f393ba932
+  metadata.gz: 5706ae69aaac2cd64ce85bd89e9caa6e408811d4d50997984e1a3c79861a902cec1291b543343261fe93faaf234a83e5e4fe250ef1e9b105020d32d370e2493e
+  data.tar.gz: cf07f182cd3f97ac0a0f3a754d54509ab3e799af853407ab23b82488a169daeef20e3d2186f88d46ffce08f1f718304c74e88f2d189adabf3a5b7d0e207bc9a7

data/ec2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'aws-sdk', '2.0.23'
+  spec.add_runtime_dependency 'aws-sdk', '~> 3'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/examples/security_groups.rb

@@ -0,0 +1,17 @@
+vpc_id "vpc-myvpcid"
+
+security_group "https.webserver" do
+  description "https webserver"
+  tcp 80, cidr_ip: "0.0.0.0/0"
+  tcp 443, cidr_ip: "0.0.0.0/0"
+end
+
+security_group "internal.consul" do
+  description "internal consul"
+  tcp 8300, cidr_ip: "172.31.0.0/16"
+  tcp 8400, cidr_ip: "172.31.0.0/16"
+  tcp 8500, cidr_ip: "172.31.0.0/16"
+  tcp 8600, cidr_ip: "172.31.0.0/16"
+  tcp 8301, cidr_ip: "172.31.0.0/16"
+  tcp 8302, cidr_ip: "172.31.0.0/16"
+end

data/examples/subnets.rb

@@ -0,0 +1,20 @@
+id "vpc-asdf"
+
+subnet "name" do
+  az "ap-southeast-1a"
+  cidr "172.31.1.0/24"
+end
+
+def msubnet(number, name)
+  subnet "#{name}-a" do
+    az "ap-southeast-1a"
+    cidr "172.31.#{number}.0/25"
+  end
+
+  subnet "#{name}-b" do
+    az "ap-southeast-1b"
+    cidr "172.31.#{number}.128/25"
+  end
+end
+
+msubnet 10, "shared"

data/lib/ec2/cli/hosts.rb

@@ -27,7 +27,7 @@ module Ec2
       end
 
       def config
-        @config ||= ::Ec2::Config.new("ec2.conf").config
+        @config ||= ::Ec2::Config.new("ec2.rb").config
       end
 
       def opts

data/lib/ec2/cli/resources.rb

@@ -24,15 +24,16 @@ module Ec2
         @lock ||= ::Ec2::Lock.new
       end
 
-
       def init_aws
-        credentials = Aws::Credentials.new(config[:aws_key], config[:aws_secret])
-        Aws.config[:credentials] = credentials
+        if not config[:use_iam]
+          credentials = Aws::Credentials.new(config[:aws_key], config[:aws_secret])
+          Aws.config[:credentials] = credentials
+        end
         Aws.config[:region] = config[:region]
       end
 
       def config
-        @config ||= ::Ec2::Config.new("ec2.conf").config
+        @config ||= ::Ec2::Config.new("ec2.rb").config
       end
 
       def opts

data/lib/ec2/config.rb

@@ -12,6 +12,7 @@ module Ec2
       return @config if @config
       @config = {
         region: "ap-southeast-1",
+        use_iam: true
       }
       read_config
       return @config
@@ -29,10 +30,12 @@ module Ec2
 
     def aws_key(aws_key)
       set :aws_key, aws_key
+      set :use_iam, false
     end
 
     def aws_secret(aws_secret)
       set :aws_secret, aws_secret
+      set :use_iam, false
     end
 
     def set(key, value)

data/lib/ec2/salt_cloud.rb

@@ -32,8 +32,10 @@ module Ec2
     private
 
     def init_aws
-      credentials = Aws::Credentials.new(config[:aws_key], config[:aws_secret])
-      Aws.config[:credentials] = credentials
+      if not config[:use_iam]
+        credentials = Aws::Credentials.new(config[:aws_key], config[:aws_secret])
+        Aws.config[:credentials] = credentials
+      end
       Aws.config[:region] = config[:region]
     end
 

data/lib/ec2/version.rb

@@ -1,3 +1,3 @@
 module Ec2
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Neeraj Bhunwal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Integrates ec2 resources with salt
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,6 +69,8 @@ files:
 - dev_bin/ec2
 - ec2.gemspec
 - examples/profiles.rb
+- examples/security_groups.rb
+- examples/subnets.rb
 - examples/templates.rb
 - examples/test.rb
 - lib/ec2.rb
@@ -100,17 +102,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Integrates ec2 resources with salt