vominator 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f2c3eeb2bdb95eda2193e4a341e0aecbb4478d5
-  data.tar.gz: 9e24e5a58270175f46bc3f295c265c107f330af1
+  metadata.gz: f0c0d2ced046104f160fbe3dcfe0eb1d62bda5de
+  data.tar.gz: 5c5d4b48d8c3f3e608b81e67b97754e95307a926
 SHA512:
-  metadata.gz: 2260cee2e7f3b6ad10c0915b75eddb77b7bd7f7b40177208e8299f2d9d126c2af631562948bb2b427b82aaa59a7fe198da4c0cb8ab84ce81a7f177e5d69c0d15
-  data.tar.gz: 133b6eca3cfa06e0b304a2ae2d378ca0b92ae0eaeb6a5762862cb93852f007fbc7ffc04336e26ce3a8e1b944594b3f22300076ae10c582a01b33ee56516df7c9
+  metadata.gz: ab07df9cde02ebf6fa2708dfa06d285ae8e47f5d18333c9b74f1f7e550c8d49f25200574af4fa9daed8ea41e92265e737cd75eb98630523cfbbe546a2988a4c1
+  data.tar.gz: e435d4d9781779295c8aea362c675c473463d84ed6d5fab1e192e1b58a261540159e34e541354db2682ddeae7b1e604a6ec978e92b04dd7eb84c850b2f6db5ff

data/README.md

@@ -18,8 +18,6 @@ See Usage for details about puke
 2. Create ~/.vominator.yaml
 ```
 ---
-access_key_id: AWS_SECRET_KEY
-secret_access_key: AWS_SECRET_ACCESS_KEY
 configuration_path: Location to puke
 key_pair_name: infrastructure@example.com
 instances_file: Location for cache file IE /Users/foo/.vominator/instances-metadata
@@ -69,6 +67,7 @@ Usage: vominate vpc create [options]
         --parent-domain PARENT DOMAIN
                                      REQUIRED: The parent domain name that will be used to create a seperate subdomain zone file for the new environment. IE, if you provide foo.org and your environment as bar, this will yield a new Route 53 zone file called bar.foo.org
         --cidr-block CIDR Block      REQUIRED: The network block for the new environment. This must be a /16 and the second octet should be unique for this environment. IE. 10.123.0.0/16
+        --account ACCOUNT            REQUIRED: The AWS account that you want to create this VPC in
     -d, --debug                      OPTIONAL: debug output
     -h, --help                       OPTIONAL: Display this screen 
 ```

data/lib/ec2/instances.rb

@@ -29,10 +29,6 @@ OptionParser.new do |opts|
     options[:test] = true
   end
 
-  opts.on('--fix-security-groups', 'OPTIONAL: Fix an instances security groups') do
-    options[:fix_security_groups] = true
-  end
-
   opts.on('--disable-term-protection', 'OPTIONAL: This will disable termination protection on the targeted instances') do
     options[:disable_term_protection] = true
   end
@@ -114,6 +110,7 @@ unless instances
 end
 
 #Get ec2 connection, which is then passed to specific functions. Maybe a better way to do this?
+Aws.config[:credentials] = Aws::SharedCredentials.new(:profile_name => puke_config['account'])
 ec2 = Aws::EC2::Resource.new(region: puke_config['region_name'])
 ec2_client = Aws::EC2::Client.new(region: puke_config['region_name'])
 
@@ -146,6 +143,7 @@ instances.each do |instance|
   instance_ebs_volumes = instance['ebs'].nil? ? [] : instance['ebs']
   key_name = Vominator.get_key_pair(VOMINATOR_CONFIG)
   ssm_documents = instance['ssm_documents'].nil? ? [] : instance['ssm_documents']
+  instance_az = instance['az'][options[:environment]] || instance['az']
 
   LOGGER.info("Working on #{fqdn}")
 
@@ -168,9 +166,9 @@ instances.each do |instance|
   #Check to see if the subnet exists for the instance. If not we should create it.
   subnet = "#{instance_ip.rpartition('.')[0]}.0/24"
   unless existing_subnets[subnet]
-    unless test?("Would create a subnet for #{subnet} in #{instance['az']} and associate with the appropriate routing table")
-      existing_subnets[subnet] = Vominator::EC2.create_subnet(ec2, subnet, instance['az'], puke_config['vpc_id'], puke_config['route_tables'][instance['az']])
-      LOGGER.success("Created #{subnet} in #{instance['az']} for #{fqdn}")
+    unless test?("Would create a subnet for #{subnet} in #{instance_az} and associate with the appropriate routing table")
+      existing_subnets[subnet] = Vominator::EC2.create_subnet(ec2, subnet, instance_az, puke_config['vpc_id'], puke_config['route_tables'][instance_az])
+      LOGGER.success("Created #{subnet} in #{instance_az} for #{fqdn}")
     end
   end
 
@@ -289,7 +287,7 @@ instances.each do |instance|
           LOGGER.info("#{fqdn} is missing the following security groups: #{sg_missing.join(', ')}")
           updated_groups = instance_security_groups - Vominator::EC2.set_security_groups(ec2, ec2_instance.id, instance_security_groups, vpc_security_groups)
           if updated_groups.count > 0
-            LOGGER.fatal "Failed to set #{updated_groups.join(', ')} for #{fqdn}"
+            LOGGER.warning "Failed to set #{updated_groups.join(', ')} for #{fqdn}"
           else
             LOGGER.success "Succesfully set security groups for #{fqdn}"
           end
@@ -346,10 +344,9 @@ instances.each do |instance|
 
   else #The instance does not exist, in which case we want to create it.
     user_data = Vominator::Instances.generate_cloud_config(hostname, options[:environment], instance['family'], instance['chef_roles'], instance['chef_recipes'])
-    security_group_ids = instance_security_groups.map {|sg| vpc_security_groups[sg] }
-
+    security_group_ids = instance_security_groups.map {|sg| vpc_security_groups[sg] }.compact
     unless test?("Would create #{fqdn}")
-      ec2_instance = Vominator::EC2.create_instance(ec2, hostname, options[:environment], ami, existing_subnets[subnet].id, instance_type, key_name, instance_ip, instance['az'], security_group_ids, user_data, ebs_optimized, instance['iam_profile'])
+      ec2_instance = Vominator::EC2.create_instance(ec2, hostname, options[:environment], ami, existing_subnets[subnet].id, instance_type, key_name, instance_ip, instance_az, security_group_ids, user_data, ebs_optimized, instance['iam_profile'])
       if ec2_instance
         LOGGER.success("Succesfully created #{fqdn}")
         ec2_instances[instance_ip] = {:instance_id => ec2_instance.id, :security_groups => ec2_instance.security_groups.map { |sg| sg.group_name}}

data/lib/ec2/security_groups.rb

@@ -104,6 +104,7 @@ unless puke_security_groups
   LOGGER.fatal('Unable to load security groups . Make sure the product is correctly defined for the environment you have selected and that a security_groups.yaml file exists with at least one group defined.')
 end
 
+Aws.config[:credentials] = Aws::SharedCredentials.new(:profile_name => puke_config['account'])
 ec2_client = Aws::EC2::Client.new(region: puke_config['region_name'])
 
 

data/lib/ec2/ssm.rb

@@ -58,6 +58,7 @@ unless test?('Vominator is running in test mode. It will NOT make any changes.')
   end
 end
 
+Aws.config[:credentials] = Aws::SharedCredentials.new(:profile_name => puke_config['account'])
 ssm = Aws::SSM::Client.new(region: puke_config['region_name'])
 
 aws_documents = Vominator::SSM.get_documents(ssm)

data/lib/vominator/aws.rb

@@ -2,8 +2,6 @@ require 'aws-sdk'
 require_relative 'vominator'
 require_relative 'constants'
 
-Aws.config[:credentials] = Aws::Credentials.new(VOMINATOR_CONFIG['access_key_id'], VOMINATOR_CONFIG['secret_access_key'])
-
 module Vominator
   class AWS
     def self.get_availability_zones(ec2_client)
@@ -12,4 +10,4 @@ module Vominator
       return zones
     end
   end
-end
+end

data/lib/vominator/version.rb

@@ -1,3 +1,3 @@
 module Vominator
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/lib/vpc/create.rb

@@ -31,7 +31,11 @@ OptionParser.new do |opts|
   opts.on('--cidr-block CIDR Block', 'REQUIRED: The network block for the new environment. This must be a /16 and the second octet should be unique for this environment. IE. 10.123.0.0/16') do |value|
     options[:cidr_block] = value
   end
-  
+
+  opts.on('--account ACCOUNT', 'REQUIRED: The AWS account that you want to create this VPC in') do |value|
+    options[:account] = value
+  end
+
   #opts.on('-t', '--test', 'OPTIONAL: Test run. Show what would be changed without making any actual changes') do
   #  options[:test] = true
   #end
@@ -52,7 +56,7 @@ OptionParser.new do |opts|
   begin
     opts.parse!
     ## Validate Data Inputs
-    throw Exception unless ((options.include? :environment) && (options.include? :region) && (options.include? :parent_domain) && (options.include? :cidr_block)) || options[:list]
+    throw Exception unless ((options.include? :environment) && (options.include? :region) && (options.include? :parent_domain) && (options.include? :cidr_block) && (options.include? :account)) || options[:list]
   rescue
     puts opts
     exit
@@ -81,6 +85,7 @@ else
   puke_config['region_name'] = options[:region]
 end
 
+Aws.config[:credentials] = Aws::SharedCredentials.new(:profile_name => options[:account])
 ec2_client = Aws::EC2::Client.new(region: puke_config['region_name'])
 r53_client = Aws::Route53::Client.new(region: puke_config['region_name'])
 
@@ -125,6 +130,8 @@ end
 
 vpc = Vominator::VPC.create_vpc(ec2_client,options[:cidr_block])
 
+Vominator::EC2.tag_resource(ec2_client, vpc.vpc_id,[{key: 'Name', value: fqdn}])
+
 gateway = Vominator::VPC.create_internet_gateway(ec2_client)
 
 Vominator::VPC.attach_internet_gateway(ec2_client, gateway.internet_gateway_id, vpc.vpc_id)
@@ -146,6 +153,13 @@ availability_zones.each do |zone|
 
   Vominator::EC2.tag_resource(ec2_client, private_route_table.route_table_id,[{key: 'Name', value: "nat-#{options[:environment]}-#{zone}"}])
 
+  # Seed Initial Private Subnet
+  private_subnet_cidr_block = "#{options[:cidr_block].split('.')[0]}.#{options[:cidr_block].split('.')[1]}.1#{third_octet}.0/24"
+  private_subnet = Vominator::VPC.create_subnet(ec2_client, vpc.vpc_id, private_subnet_cidr_block, zone)
+
+  Vominator::VPC.associate_route_table(ec2_client, private_subnet.subnet_id, private_route_table.route_table_id)
+
+  # Seed Initial Public Subnet
   public_subnet_cidr_block = "#{options[:cidr_block].split('.')[0]}.#{options[:cidr_block].split('.')[1]}.#{third_octet}.0/24"
   public_subnet = Vominator::VPC.create_subnet(ec2_client, vpc.vpc_id, public_subnet_cidr_block, zone)
 
@@ -168,6 +182,7 @@ end
 
 config = {
     options[:environment] => {
+        'account' => options[:account],
         'vpc_id' => vpc.vpc_id,
         'route_tables' => route_tables,
         'region_name' => options[:region],

data/spec/lib/vominator/vominator_spec.rb

@@ -23,8 +23,6 @@ describe Vominator do
       subject { vominator_config }
 
       it { is_expected.not_to be false }
-      it { is_expected.to include('access_key_id' => 'DUMMY_ACCESS_KEY') }
-      it { is_expected.to include('secret_access_key' => 'DUMMY_SECRET_KEY') }
       it { is_expected.to include('configuration_path' => 'test/puke') }
       it { is_expected.to include('key_pair_name' => 'ci@example.com') }
       it { is_expected.to include('chef_client_key' => 'ci.pem') }

data/test/puke/config.yaml

@@ -1,5 +1,6 @@
 ---
 test:
+  account: example-account
   vpc_id: vpc-ada2d4c8
   region_name: us-east-1
   zone: Z2IOTRJNNABNJ

data/test/vominator.yaml

@@ -1,6 +1,4 @@
 ---
-access_key_id: DUMMY_ACCESS_KEY
-secret_access_key: DUMMY_SECRET_KEY
 configuration_path: test/puke
 key_pair_name: ci@example.com
 chef_client_key: ci.pem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vominator
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Chris Kelly
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk