bosh_cli_plugin_redis 0.2.0 → 0.2.1

data/ChangeLog.md

@@ -22,6 +22,10 @@ Converted into a bosh plugin. Prefix "bosh" to the sub-commands below:
 
 Note: the `cf bind-redis-env-var` command has been removed as it is a) specific to a Cloud Foundry user not a bosh user; b) kinda crappy "services" integration. Perhaps move it back into a cf plugin in future.
 
+Other features/fixes:
+
+* Validates the resource size with available sizes in the template [v0.2.1]
+
 ## v0.1 - redis-cf-plugin
 
 Initial release! The initial commands offered are:

data/bosh_cli_plugin_redis.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "bosh_cli_plugin_redis"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create dedicated Redis servers using Bosh}

data/bosh_release/templates/openstack/spec

@@ -0,0 +1,13 @@
+---
+resources:
+- small
+- medium
+- large
+- xlarge
+
+properties:
+- name: redis.resource
+  description: Resource/flavor of instance to use
+- name: redis.security_group
+  description: Security group for instance(s). Must have TCP ports 22 & 6379 open.
+  default: default

data/lib/bosh/cli/commands/redis.rb

@@ -66,9 +66,14 @@ module Bosh::Cli::Command
       nl
       say "CPI: #{bosh_cpi}"
       say "Deployment name: #{service_name.make_green}"
-      say "Resource size: #{resource_size.make_green}"
+      say "Resource size: #{validated_resource_size_colored(resource_size)}"
       say "Security group: #{security_group.make_green}"
       nl
+
+      step("Validating resource size", "Resource size must be in #{available_resource_sizes.join(', ')}", :fatal) do
+        available_resource_sizes.include?(resource_size)
+      end
+
       unless confirmed?("Security group exists with ports 22 & #{redis_port}")
         cancel_deployment
       end
@@ -119,6 +124,10 @@ module Bosh::Cli::Command
       # re-set current deployment to show output
       deployment_cmd.set_current(deployment_file)
       deployment_cmd(non_interactive: options[:non_interactive]).perform
+    rescue Bosh::Cli::ValidationHalted
+      errors.each do |error|
+        say error.make_red
+      end
     end
 
     usage "show redis uri"
@@ -165,6 +174,35 @@ module Bosh::Cli::Command
       chdir(bosh_release_dir, &block)
     end
 
+    def template_file(file)
+      File.join(bosh_release_dir, "templates", bosh_cpi, file)
+    end
+
+    def bosh_release_spec
+      @bosh_release_spec ||= begin
+        unless File.exists?(template_file("spec"))
+          err "Bosh release templates missing 'spec'"
+        end
+        YAML.load_file(template_file("spec"))
+      end
+    end
+
+    def available_resource_sizes
+      resources = bosh_release_spec["resources"]
+      if resources && resources.is_a?(Array) && resources.first.is_a?(String)
+        resources
+      else
+        err "template spec needs 'resources' key with list of resource pool names available"
+      end
+    end
+
+    # If resource_size is within +available_resource_sizes+ then display it in green;
+    # else display it in red.
+    def validated_resource_size_colored(resource_size)
+      available_resource_sizes.include?(resource_size) ?
+        resource_size.make_green : resource_size.make_red
+    end
+
     def bosh_status
       @bosh_status ||= begin
         step("Fetching bosh information", "Cannot fetch bosh information", :fatal) do
@@ -182,10 +220,6 @@ module Bosh::Cli::Command
       bosh_status["cpi"]
     end
 
-    def template_file(file)
-      File.join(bosh_release_dir, "templates", bosh_cpi, file)
-    end
-
     # TODO this is now a bosh cli command itself; use #director
     def bosh_director_client
       director
@@ -207,9 +241,8 @@ module Bosh::Cli::Command
       cmd
     end
 
-    # TODO this is now a bosh cli command itself
     def deployment_file
-      @current_deployment_file ||= ::Bosh::Cli::Command::Deployment.new.deployment
+      deployment
     end
 
     # TODO use bosh cli helpers to validate/require this

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli_plugin_redis
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -87,6 +87,7 @@ files:
 - bosh_release/templates/aws/spec
 - bosh_release/templates/openstack/sample_deployment_file.yml
 - bosh_release/templates/openstack/single_vm.yml.erb
+- bosh_release/templates/openstack/spec
 - lib/bosh/cli/commands/redis.rb
 homepage: ''
 licenses:
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4389263479679262262
+      hash: -3254480115549192426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4389263479679262262
+      hash: -3254480115549192426
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25