akashi 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c585789936116ffa436714037b34c40314c0937
-  data.tar.gz: 04c68d2a080bab2620ebe9dde043189d9c7f7aa3
+  metadata.gz: 9578ab2da51b4e6bac5c4649ea48949afa3697e8
+  data.tar.gz: 8e9fc90836052a360b7fa320877095182db95c8d
 SHA512:
-  metadata.gz: d8424c0f6a23093048ec4b46342ed0fc88b4b07526167e9ca01ac0d0363688c41cb1f1db75752f316dba5369dafdfeee70d6895b5eb98585df057d86f94e5d38
-  data.tar.gz: dc685d6d9cacf371d76a85b9205fb01ea947b38f6ed16e502ab0e59f038967fd5604a03439ec8b44c42f8523eec9421cdfcf8f0b46f2e4c0655075b997662916
+  metadata.gz: 835bbd20859477ea8f0ad23c1802b46d9407034eb554752e46b9aa96980375455a3a326cd04cf2acca377a3f2f1191341dc5ac6e77d7acba9ef3c4135f1ee837
+  data.tar.gz: 0042ef7066c052ecdc3fde6ccddd8ade64859263d75d8d9801d8b349a043d79999a890a59282365149b986ce2f8d99f47c52b10208b65f648df5432cb59cfd72

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    akashi (0.0.3)
+    akashi (0.0.6)
       activesupport
       aws-sdk
       hashie

data/lib/akashi/builder.rb

@@ -1,12 +1,12 @@
 module Akashi
   class Builder
     def build
+      create_ssl_certificate
       create_vpc
       create_internet_gateway
       create_subnets
       create_security_groups
       create_key_pair
-      create_ssl_certificate
       create_ec2_instances
       create_subnet_group
       create_db_instance

data/lib/akashi/elb/ssl_certificate.rb

@@ -18,7 +18,7 @@ module Akashi
             private_key:             OpenSSL::PKey::RSA.new(File.read(private_key_path)).to_pem,
             server_certificate_name: Akashi.name,
           }
-          options.merge!({ certificate_chain: certificate_chain }) if !!certificate_chain
+          options.merge!(certificate_chain: certificate_chain) if !!certificate_chain
 
           response = Akashi::Aws.iam.client.upload_server_certificate(options)
 

data/lib/akashi/rds/db_instance.rb

@@ -6,7 +6,7 @@ module Akashi
 
       class << self
         def create(security_group:)
-          password = Akashi.manifest.rds.password || random_password(10)
+          password = Akashi.manifest.rds.password || random_password(length: 10)
           options  = {
             db_name:                    Akashi.name(separator: "_"),
             db_instance_identifier:     Akashi.name,
@@ -16,7 +16,6 @@ module Akashi
             master_username:            Akashi.application,
             master_user_password:       password,
             multi_az:                   !!Akashi.manifest.rds.multi_az,
-            availability_zone:          Akashi.manifest.rds.availability_zone,
             vpc_security_group_ids:     [ security_group.id ],
             db_subnet_group_name:       Akashi.name,
             engine_version:             Akashi.manifest.rds.engine_version,
@@ -26,6 +25,9 @@ module Akashi
           if !!Akashi.manifest.rds.parameter_group_name
             options.merge!(db_parameter_group_name: Akashi.manifest.rds.parameter_group_name)
           end
+          unless !!Akashi.manifest.rds.multi_az
+            options.merge!(availability_zone: Akashi.manifest.rds.availability_zone)
+          end
 
           response = Akashi::Aws.rds.client.create_db_instance(options)
 
@@ -34,7 +36,7 @@ module Akashi
           end
         end
 
-        def random_password(length)
+        def random_password(length:)
           [*0..9, *"a".."z", *"A".."Z"].sample(length).join
         end
 

data/lib/akashi/version.rb

@@ -1,3 +1,3 @@
 module Akashi
-  VERSION = "0.0.3"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akashi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - asonas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport