aws-rds 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9fe826eb909d7aacfaa749ce2dda50fa78f661ca0118f98382dafe89a0719d6
-  data.tar.gz: 27fc99982138438e710edeb13667615f9899a88d01bb8bb4711ae9b1160b02e7
+  metadata.gz: 209e982feec0bfdb302cfcf95a81deaf839bbfbeb93743654d7144dbc855ecbe
+  data.tar.gz: 0f15891092ddaf3f9349cb470bf8ef87ab2012963f9a59afd519a278046331ab
 SHA512:
-  metadata.gz: 84503f0be3e434f230b6c960d9ede2f29907555cc7493c8f7bc0373f56c362f5c764a2de0b250c6356b0625c960e3c385cf79ab1449afbfaf2f8e0c18653679b
-  data.tar.gz: 67dc8e464180f8acd84887ba59b4eed66c39a67f22ee3352b4cdfcdbcb1bce6619d89977fb188e05e9f771acc82e06bec0caa298f922e121a77df12cda71d4b5
+  metadata.gz: e0fe672de8e1660cfabcc43e053739f0fc8df4b10f3d10802c99651d738611f308871c4eed717931d052cbd83108e27a3f6fb1353d504672b8572dba8da2df71
+  data.tar.gz: 7f067c4b6f1de6fa0aaf681f36cf7b82789864a6f4ca213002183dd4005904860d2be1388ab972853580da4ab0179b580e120089f46a68fb25d146bcb1073133

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.6.0]
+- security-group-name option takes the highest precedence, over the the profile vpc_security_group_ids setting
+- improve error messaging
+
 ## [0.5.0]
 - change config/env.yml option name to: fallback vpc_id and db_subnet_group_name
 

data/docs/example/profiles/default.yml

@@ -6,5 +6,5 @@ master_username: changeme
 engine: postgres
 vpc_security_group_ids: <%= config["vpc_security_group_ids"].inspect %>
 # db_name: mydb # can be overridden at the cli
-# vpc_security_group_ids: # can be also automatically set by specifying --security-group-name at the CLI
+# vpc_security_group_ids: # can be also automatically created and set by specifying --security-group-name at the CLI
 # db_instance_identifier: not respected here. always set from the cli

data/lib/aws_rds/create/params.rb

@@ -22,21 +22,36 @@ class AwsRds::Create
       params
     end
 
+    # Explanation of different security groups:
+    #
+    #   db_security_groups: classic RDS db security groups, separtae groups from
+    #   from ec2 security groups.
+    #   vpc_security_group_ids: vpc security groups. same groups as what the ec2
+    #   security groups use.
+    #
+    # db_security_groups is not really recommended anymore because it is the
+    # EC2-classic network.
     def set_security_groups(params)
       return params if @options[:noop]
-      # dont create SG if user has set one
-      #   db_security_groups: classic RDS db security groups, separtae groups from
-      #   from ec2 security groups.
-      #   vpc_security_group_ids: vpc security groups. same groups as what the ec2
-      #   security groups use.
-      # db_security_groups is not really recommended anymore because it is the
-      # EC2-classic network.
-      return params if params['vpc_security_group_ids'] || params['db_security_groups']
 
-      security_group_name = @options[:security_group_name] || @options[:name]
-      sg = AwsRds::SecurityGroup.find_or_create(security_group_name)
-      params['vpc_security_group_ids'] ||= [sg.group_id]
-      params
+      if @options[:security_group_name]
+        security_group_name = @options[:security_group_name]
+        sg = AwsRds::SecurityGroup.find_or_create(security_group_name)
+        params['vpc_security_group_ids'] ||= [sg.group_id]
+        params
+      elsif params['vpc_security_group_ids'] || params['db_security_groups']
+        # security group already set in profile, do nothing
+        params
+      else
+        puts "ERROR: A security group was not specified.".colorize(:red)
+        puts <<-EOL
+You can either specify the vpc_security_group_ids variable in the profile you can use the --security-group-name cli option.
+
+If you use the --security-group-name option, then aws-rds will use the existing security group or create a new one if necessary.
+
+EOL
+        exit 1
+      end
     end
 
     def set_db_subnet_group(params)
@@ -47,7 +62,7 @@ class AwsRds::Create
     def fallback_db_subnet_group_name
       AwsRds.config["fallback"]["db_subnet_group_name"]
     rescue NoMethodError => e
-      puts e.message
+      puts "ERROR: a db_subnet_group_name was not specified.".colorize(:red)
       puts <<-EOL
 No db_subnet_group_name was specified in your profile. Also, a fallback db subnet group name was set.
 

data/lib/aws_rds/security_group.rb

@@ -12,7 +12,7 @@ module AwsRds
       sg = resp.security_groups.first
       return sg if sg
 
-      puts "Creating security group #{name}"
+      puts "Creating security group #{name}".colorize(:green)
       result = ec2.create_security_group(
         group_name: name,
         description: name,
@@ -30,12 +30,13 @@ module AwsRds
     def fallback_vpc_id
       AwsRds.config["fallback"]["vpc_id"]
     rescue NoMethodError => e
-      puts e.message
+      puts "ERROR: a vpc_id was not specified.".colorize(:red)
       puts <<-EOL
-Unable to load a fallback vpc id from your config/#{AwsRds.env}.yml.
-Please specify a fallback vpc_id setting.
+No vpc_id was specified in your profile. Also, a fallback vpc_id was set.
 
-Example config/#{AwsRds.env}.yml:
+Please add a vpc_id in your profile file or add a fallback vpc_id to your config/#{AwsRds.env}.yml.
+
+To specify a fallback vpc_id setting. Example config/#{AwsRds.env}.yml:
 ---
 fallback:
   vpc_id: vpc-123

data/lib/aws_rds/version.rb

@@ -1,3 +1,3 @@
 module AwsRds
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-rds
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tung Nguyen