bosh-cloudfoundry 0.7.0.alpha.2 → 0.7.0.alpha.3

data/bosh-cloudfoundry.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "bosh-cloudfoundry"
-  spec.version       = "0.7.0.alpha.2"
+  spec.version       = "0.7.0.alpha.3"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create & manage Cloud Foundry deployments}

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

@@ -106,7 +106,7 @@ module Bosh::Cli::Command
             },
             "networks" => {},
             "properties" => {
-              "cf" => attrs.attributes_with_string_keys
+              attrs.properties_key => attrs.attributes_with_string_keys
             }
           }.to_yaml
         end
@@ -126,7 +126,18 @@ module Bosh::Cli::Command
       end
     end
 
+    usage "show cf passwords"
+    desc "display the internal passwords for deployment"
+    def show_cf_passwords
+      load_deployment_into_attributes
+      say "Common password: #{attrs.validated_color(:common_password)}"
+    end
+
     protected
+    def load_deployment_into_attributes
+      attrs.load_deployment_file(deployment)
+    end
+
     def release_versioned_template
       @release_versioned_template ||= begin
         Bosh::Cloudfoundry::ReleaseVersionedTemplate.new(release_version, bosh_cpi, deployment_size)

data/lib/bosh/cloudfoundry/deployment_attributes.rb

@@ -11,10 +11,11 @@ module Bosh::Cloudfoundry
       @bosh_status = bosh_status
       @released_versioned_template = released_versioned_template
       @attributes = attributes
-      @attributes[:name] = default_name
-      @attributes[:core_size] = default_size
-      @attributes[:persistent_disk] = default_persistent_disk
-      @attributes[:security_group] = default_security_group
+      @attributes[:name] ||= default_name
+      @attributes[:core_size] ||= default_size
+      @attributes[:persistent_disk] ||= default_persistent_disk
+      @attributes[:security_group] ||= default_security_group
+      @attributes[:common_password] ||= random_string(12, :common)
     end
 
     def name
@@ -49,6 +50,19 @@ module Bosh::Cloudfoundry
       attributes[attribute.to_sym] = value if value
     end
 
+    def load_deployment_file(deployment_file)
+      deployment_obj = YAML.load_file(deployment_file)
+      attributes = deployment_obj["properties"][properties_key]
+      @attributes = attributes.inject({}) do |mem, key_value|
+        k, v = key_value; mem[k.to_sym] = v; mem
+      end
+    end
+
+    # attributes are stored within deployment file at properties.cf
+    def properties_key
+      "cf"
+    end
+
     def validate(attribute)
       value = attributes[attribute.to_sym]
       if attribute.to_s =~ /size$/
@@ -120,5 +134,21 @@ module Bosh::Cloudfoundry
       @bosh_status["cpi"]
     end
 
+    # Generate a random string for passwords and tokens.
+    # Length is the length of the string.
+    # name is an optional name of a previously generated string. This is used
+    # to allow setting the same password for different components.
+    # Extracted from Bosh::Cli::Command::Biff
+    def random_string(length, name=nil)
+      random_string = SecureRandom.hex(length)[0...length]
+
+      @random_cache ||= {}
+      if name
+        @random_cache[name] ||= random_string
+      else
+        random_string
+      end
+    end
+
   end
 end

data/spec/plugin_spec.rb

@@ -40,6 +40,18 @@ describe Bosh::Cli::Command::CloudFoundry do
   end
 
   context "create cf" do
+    it "requires --ip 1.2.3.4" do
+      command.add_option(:dns, "mycloud.com")
+      command.add_option(:size, "xlarge")
+      expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
+    end
+
+    it "requires --dns" do
+      command.add_option(:ip, ["1.2.3.4"])
+      command.add_option(:size, "xlarge")
+      expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
+    end
+
     context "with requirements" do
       before do
         command.add_option(:config, home_file(".bosh_config"))
@@ -97,19 +109,18 @@ describe Bosh::Cli::Command::CloudFoundry do
           command.create_cf
         end
       end
-    end
 
-    it "requires --ip 1.2.3.4" do
-      command.add_option(:dns, "mycloud.com")
-      command.add_option(:size, "xlarge")
-      expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
-    end
+      context "and show passwords" do
+        it "displays the list of internal passwords" do
+          in_home_dir do
+            command.create_cf
+            command.show_cf_passwords
+          end
+        end
+      end
 
-    it "requires --dns" do
-      command.add_option(:ip, ["1.2.3.4"])
-      command.add_option(:size, "xlarge")
-      expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
     end
 
   end
+
 end

data/templates/v132/aws/dev/deployment_file.yml.erb

@@ -30,7 +30,7 @@ ip_addresses    = find("properties.cf.ip_addresses")
 security_group  = find("properties.cf.security_group")
 core_size       = find("properties.cf.core_size")
 persistent_disk = find("properties.cf.persistent_disk")
-common_password = random_string 12, :common
+common_password = find("properties.cf.common_password")
 -%>
 name: <%= name %>
 director_uuid: <%= find("director_uuid") %>
@@ -142,11 +142,13 @@ jobs:
 
 properties:
   cf:
+    name: <%= name %>
     dns: <%= dns %>
     ip_addresses: <%= ip_addresses.inspect %>
     core_size: <%= core_size %>
     security_group: <%= security_group %>
     persistent_disk: <%= persistent_disk %>
+    common_password: <%= common_password %>
 
   domain: <%= dns %>
   system_domain: <%= dns %>.com

data/templates/v132/openstack/dev/deployment_file.yml.erb

@@ -30,7 +30,7 @@ ip_addresses    = find("properties.cf.ip_addresses")
 security_group  = find("properties.cf.security_group")
 core_size       = find("properties.cf.core_size")
 persistent_disk = find("properties.cf.persistent_disk")
-common_password = random_string 12, :common
+common_password = find("properties.cf.common_password")
 -%>
 name: <%= name %>
 director_uuid: <%= find("director_uuid") %>
@@ -142,11 +142,13 @@ jobs:
 
 properties:
   cf:
+    name: <%= name %>
     dns: <%= dns %>
     ip_addresses: <%= ip_addresses.inspect %>
     core_size: <%= core_size %>
     security_group: <%= security_group %>
     persistent_disk: <%= persistent_disk %>
+    common_password: <%= common_password %>
 
   domain: <%= dns %>
   system_domain: <%= dns %>.com

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha.2
+  version: 0.7.0.alpha.3
   prerelease: 6
 platform: ruby
 authors:
@@ -411,7 +411,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4235919160106065906
+      hash: -1493789515290037622
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: