vagrant-bosh 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc32c9ec7924465b7ecb3ddeef08cd47e6d1eb4
-  data.tar.gz: 9560d462714efd859191da51ee22c37ed4d5cb67
+  metadata.gz: 831ea9bc4698d6a0dea969a338e2d48bfc936306
+  data.tar.gz: d5454ec89149ebd6779f72b7d27226284bdd1bde
 SHA512:
-  metadata.gz: b84f34a4a5ad470c17c3528be1335cd254b674dbcc24da43e74077afdcf2fc2c67a0dbf18e64ddef73c1931e699ebc3e6bd2a18659ce025bc10807ab4fd820b4
-  data.tar.gz: c5abbab55e5ca3bf253b53f4d12bbce3c5c3a9e01815e7543b0e4ca253e5b63342a73b1e39b3fa360220503c369231cb4dc4ab8fc44fc379e901b1ee404e6569
+  metadata.gz: d34fbdcc2ef35e1174997bb0b98800d14493a2a2a308d50a728154be225fe6edc6b6421d1f16ceb7a258195e2f6d956257cbca6af8225ba3f6a0a29430d5e3b9
+  data.tar.gz: d56779c9cca2243e903c21690c1c7a379ed4d663b850554a03aabaf352f646de4aa99c5b0c8797621b92d63498bc7deb5d5a6dd1d8279e0cff67a84bac038055

data/.gitmodules

@@ -1,6 +1,6 @@
 [submodule "bosh"]
 	path = bosh
 	url = https://github.com/cloudfoundry/bosh.git
-[submodule "go/src/github.com/fraenkel/candiedyaml"]
-	path = go/src/github.com/fraenkel/candiedyaml
-	url = https://github.com/fraenkel/candiedyaml.git
+[submodule "go/src/github.com/cloudfoundry-incubator/candiedyaml"]
+	path = go/src/github.com/cloudfoundry-incubator/candiedyaml
+	url = https://github.com/cloudfoundry-incubator/candiedyaml.git

data/README.md

@@ -5,14 +5,17 @@ BOSH provisioner allows to provision guest VM by specifying regular BOSH deploym
 
 ### Usage
 
-1. Add new VM provision section to your `Vagrantfile`. For example:
+1. `vagrant plugin install vagrant-bosh`
+
+2. Add new VM provision section to your `Vagrantfile`. For example:
 
 ```
 Vagrant.configure("2") do |config|
   config.vm.box = "precise64"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
-  config.vm.network "forwarded_port", guest: 25555, host: 25555 # for BOSH Director API
+  # Example port forward for example-bosh-manifest.yml
+  config.vm.network "forwarded_port", guest: 25555, host: 25555 # BOSH Director API
 
   config.vm.provider "virtualbox" do |v|
     v.memory = 4096
@@ -26,10 +29,10 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-2. Create a deployment manifest and specify it via `c.manifest` attribute.
+3. Create a deployment manifest and specify it via `c.manifest` attribute.
    See `dev/example-bosh-manifest.yml` for an example deployment manifest used to deploy BOSH Director.
 
-3. Run `vagrant provision` to provision guest VM
+4. Run `vagrant provision` to provision guest VM
    (DEBUG=1 environment variable will trigger live verbose output).
 
 
@@ -62,11 +65,7 @@ end
 ```
 git submodule update --recursive --init
 
-# Provisioner uses BOSH Agent (Go) libraries (e.g. Blobstore, CmdRunner)
-export GOPATH=$PWD/go:$PWD/bosh/go_agent
-
-go/bin/test
-go/bin/build-linux-amd64
+go/bin/test # or go/bin/build-linux-amd64
 
 # Spin up development Vagrant box with lib/ acting as BOSH provisioner
 ( cd dev/ && vagrant up )

data/go/src/boshprovisioner/deployment/manifest/deployment.go

@@ -6,6 +6,10 @@ import (
 	bosherr "bosh/errors"
 )
 
+var (
+	DefaultWatchTime = WatchTime{0, 60000}
+)
+
 func (d Deployment) InstanceWatchTime(job Job, i int) WatchTime {
 	var canaries int
 
@@ -19,7 +23,7 @@ func (d Deployment) InstanceWatchTime(job Job, i int) WatchTime {
 		return d.CanaryWatchTime(job)
 	}
 
-	return d.CanaryWatchTime(job)
+	return d.UpdateWatchTime(job)
 }
 
 func (d Deployment) CanaryWatchTime(job Job) WatchTime {

data/go/src/boshprovisioner/deployment/manifest/manifest.go

@@ -7,7 +7,7 @@ import (
 
 	bosherr "bosh/errors"
 	boshsys "bosh/system"
-	"github.com/fraenkel/candiedyaml"
+	"github.com/cloudfoundry-incubator/candiedyaml"
 )
 
 type Manifest struct {

data/go/src/boshprovisioner/deployment/manifest/watch_time.go

@@ -9,10 +9,6 @@ import (
 
 type WatchTime [2]int
 
-var (
-	DefaultWatchTime = WatchTime{0, 0}
-)
-
 func NewWatchTimeFromString(str string) (WatchTime, error) {
 	var watchTime WatchTime
 

data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties_test.go

@@ -88,6 +88,57 @@ var _ = Describe("RenderProperties", func() {
 			})
 		})
 
+		Context("when job specifies an empty string default for a nested property", func() {
+			BeforeEach(func() {
+				job = bpreljob.Job{
+					Properties: []bpreljob.Property{
+						bpreljob.Property{
+							Name:    "prop.nest-prop",
+							Default: "",
+						},
+					},
+				}
+			})
+
+			Context("when instance specifies nested property", func() {
+				BeforeEach(func() {
+					instance = bpdep.Instance{
+						Properties: map[string]interface{}{
+							"prop": map[string]interface{}{
+								"nest-prop": "instance-val",
+							},
+						},
+					}
+				})
+
+				It("returns map with property value from instance", func() {
+					Expect(props.AsMap()).To(Equal(map[string]interface{}{
+						"prop": map[string]interface{}{
+							"nest-prop": "instance-val",
+						},
+					}))
+				})
+			})
+
+			Context("when instance does not specify nested property", func() {
+				BeforeEach(func() {
+					instance = bpdep.Instance{
+						Properties: map[string]interface{}{
+							"prop": map[string]interface{}{},
+						},
+					}
+				})
+
+				It("returns map with default property from job", func() {
+					Expect(props.AsMap()).To(Equal(map[string]interface{}{
+						"prop": map[string]interface{}{
+							"nest-prop": "",
+						},
+					}))
+				})
+			})
+		})
+
 		Context("when job does not specify a default (nil) for a nested property", func() {
 			BeforeEach(func() {
 				job = bpreljob.Job{

data/go/src/boshprovisioner/instance/updater/waiter_test.go

@@ -16,7 +16,9 @@ import (
 var _ = Describe("Waiter", func() {
 	var (
 		sleptTimes  []time.Duration
+		sleepFunc   func(d time.Duration)
 		agentClient *fakebpagclient.FakeClient
+		logger      boshlog.Logger
 		waiter      Waiter
 	)
 
@@ -27,10 +29,10 @@ var _ = Describe("Waiter", func() {
 
 	BeforeEach(func() {
 		sleptTimes = []time.Duration{}
-		sleepFunc := func(d time.Duration) { sleptTimes = append(sleptTimes, d) }
+		sleepFunc = func(d time.Duration) { sleptTimes = append(sleptTimes, d) }
 
 		agentClient = &fakebpagclient.FakeClient{}
-		logger := boshlog.NewLogger(boshlog.LevelNone)
+		logger = boshlog.NewLogger(boshlog.LevelNone)
 		waiter = NewWaiter(5000, 14000, sleepFunc, agentClient, logger)
 	})
 
@@ -99,5 +101,47 @@ var _ = Describe("Waiter", func() {
 				Expect(sleptTimes).To(Equal([]time.Duration{firstTimeGap}))
 			})
 		})
+
+		Context("when watch time is starts with a 0", func() {
+			BeforeEach(func() {
+				waiter = NewWaiter(0, 14000, sleepFunc, agentClient, logger)
+			})
+
+			BeforeEach(func() {
+				agentClient.GetStateStates = []boshaction.GetStateV1ApplySpec{
+					boshaction.GetStateV1ApplySpec{JobState: "not-running"},
+					boshaction.GetStateV1ApplySpec{JobState: "running"},
+				}
+			})
+
+			It("immediately checks if instance is running", func() {
+				err := waiter.Wait()
+				Expect(err).ToNot(HaveOccurred())
+
+				Expect(sleptTimes).To(Equal([]time.Duration{
+					0 * time.Millisecond,
+					subsequentTimeGap,
+				}))
+			})
+		})
+
+		Context("when watch time ends with a 0", func() {
+			BeforeEach(func() {
+				waiter = NewWaiter(0, 0, sleepFunc, agentClient, logger)
+			})
+
+			BeforeEach(func() {
+				agentClient.GetStateStates = []boshaction.GetStateV1ApplySpec{
+					boshaction.GetStateV1ApplySpec{JobState: "running"},
+				}
+			})
+
+			It("immediately checks if instance is running", func() {
+				err := waiter.Wait()
+				Expect(err).ToNot(HaveOccurred())
+
+				Expect(sleptTimes).To(Equal([]time.Duration{0 * time.Millisecond}))
+			})
+		})
 	})
 })

data/go/src/boshprovisioner/release/job/manifest/manifest.go

@@ -4,7 +4,7 @@ package manifest
 import (
 	bosherr "bosh/errors"
 	boshsys "bosh/system"
-	"github.com/fraenkel/candiedyaml"
+	"github.com/cloudfoundry-incubator/candiedyaml"
 )
 
 type Manifest struct {

data/go/src/boshprovisioner/release/job/manifest/manifest_test.go

@@ -38,5 +38,22 @@ properties:
 				}))
 			}
 		})
+
+		It("returns manifest with property definiton default that is an empty string", func() {
+			manifestBytes := []byte(`
+properties:
+  key:
+    default: ""
+`)
+
+			manifest, err := NewManifestFromBytes(manifestBytes)
+			Expect(err).ToNot(HaveOccurred())
+
+			Expect(manifest.Job.PropertyMappings).To(HaveLen(1))
+
+			for _, propDef := range manifest.Job.PropertyMappings {
+				Expect(propDef.Default).To(Equal(""))
+			}
+		})
 	})
 })

data/go/src/boshprovisioner/release/manifest/manifest.go

@@ -4,7 +4,7 @@ package manifest
 import (
 	bosherr "bosh/errors"
 	boshsys "bosh/system"
-	"github.com/fraenkel/candiedyaml"
+	"github.com/cloudfoundry-incubator/candiedyaml"
 )
 
 type Manifest struct {

data/lib/vagrant-bosh/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantBosh
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/vagrant-bosh.gemspec

@@ -1,9 +1,11 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
+require "vagrant-bosh/version"
+
 Gem::Specification.new do |s|
   s.name    = "vagrant-bosh"
-  s.version = "0.0.1"
+  s.version = VagrantPlugins::VagrantBosh::VERSION
 
   s.homepage    = "https://github.com/cppforlife/vagrant-bosh"
   s.summary     = %q{Vagrant BOSH provisioner plugin.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bosh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dmitriy Kalinin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies: []
 description: BOSH provisioner allows to provision guest VM by specifying regular BOSH
   deployment manifest.