vagrant-bosh 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b39c42d2c0ba1faafad24df1d60a9d0f0c5a307
-  data.tar.gz: a0e9d0f83323e94d562920c7b36bed3c50e3b44d
+  metadata.gz: 6e34945bb57bd49ef8eb5fe0a92531a3034f8a69
+  data.tar.gz: 6ac43a05b657a6ce0df25e41290c2f13743c5270
 SHA512:
-  metadata.gz: e41b4554521cc02ef5e25b4adc3a49fd86569abcaf2ebf52e204c0230573c4138a28465e3ad99bcb41c0315637db2a220b0dcab15cfd4fd4c98ff3c84f5020b0
-  data.tar.gz: 896cf5defcceb1c98e6ee9825e07e2946889874884eba1be76b851edbf2359a2b2236a07f7b341bae4bec1ebfdc75d0356c79ca74b7116df80650c87705b1fbd
+  metadata.gz: 9e7eabe3954e50934c69bbd15f702ea620586e92f078f52435939961102a04cacc8c69a8605018e1d9b684b0db999badc737b11c67d43417d78a7cf08c91670d
+  data.tar.gz: 177de839fb5217569fbc93214e97f8d4e93ca7a152dbae5f8ee1b86b137b0587cffc784aa1c8ceff35dd95b7f95194d40ea642164244b22d58b2ecde4686c4de

data/dev/Vagrantfile

@@ -7,19 +7,20 @@ end
 require "../lib/vagrant-bosh"
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "saucy"
-  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-amd64-vagrant-disk1.box"
-
-  # config.vm.box = "precise64"
-  # config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  # Make sure box has large root partition
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
   # Example port forward for example-bosh-manifest.yml
   config.vm.network "forwarded_port", guest: 25555, host: 25555 # BOSH Director API
 
   # Example port forward for example-winston-manifest.yml
-  config.vm.network "forwarded_port", guest: 8080, host: 8080 # http
-  config.vm.network "forwarded_port", guest: 8081, host: 8081 # ws
-  config.vm.network "forwarded_port", guest: 5637, host: 5637 # redgreen
+  # config.vm.network "forwarded_port", guest: 8080, host: 8080 # http
+  # config.vm.network "forwarded_port", guest: 8081, host: 8081 # ws
+  # config.vm.network "forwarded_port", guest: 5637, host: 5637 # redgreen
+
+  # Example of custom private network configuration
+  # config.vm.network :private_network, ip: "192.168.56.4"
 
   config.vm.provider "virtualbox" do |v|
     v.memory = 4096

data/dev/example-bosh-manifest.yml

@@ -5,7 +5,10 @@ releases:
 # Download latest BOSH release from http://bosh-artifacts.cfapps.io/
 - name: bosh
   version: 83
-  url: file:///vagrant/bosh-2597.tgz
+  url: https://s3.amazonaws.com/bosh-jenkins-artifacts/release/bosh-2652.tgz
+- name: bosh-warden-cpi
+  version: latest
+  url: dir+bosh://../../bosh-warden-cpi-release
 
 networks:
 # Must have dynamic network
@@ -34,15 +37,16 @@ jobs:
     release: bosh
   - name: blobstore
     release: bosh
-  - name: powerdns
-    release: bosh
   - name: postgres
     release: bosh
   - name: director
     release: bosh
   - name: health_monitor
     release: bosh
-  # todo colocate warden-cpi-release once we have it
+  - name: cpi
+    release: bosh-warden-cpi
+  - name: warden
+    release: bosh-warden-cpi
 
 properties:
   ntp: ["0.us.pool.ntp.org"]
@@ -160,29 +164,35 @@ properties:
     cloud_watch_enabled: false
     resurrector_enabled: true
 
-  dns:
-    address: 10.0.2.15
-    recursor: 8.8.8.8
-    db:
-      user: bosh
-      password: bosh-password
-      host: 10.0.2.15
-      port: 5432
-      database: bosh
+  external_cpi:
+    enabled: true
+    name: cpi
 
   # Control some remote vCenter
   vcenter:
-    address: 172.16.79.132
-    user: root
-    password: vmware
-    datacenters:
-      - name: TEST_DATACENTER
-        vm_folder:       SYSTEM_MICRO_VSPHERE_VMs
-        template_folder: SYSTEM_MICRO_VSPHERE_Templates
-        disk_path:       SYSTEM_MICRO_VSPHERE_Disks
-        datastore_pattern:            datastore
-        persistent_datastore_pattern: datastore
-        allow_mixed_datastores: true
-        clusters:
-          - TEST_CLUSTER:
-              resource_pool: TEST_RP
+    address: fake-address
+    user: fake-user
+    password: fake-password
+    datacenters: []
+
+  # cpi job template
+  cpi:
+    warden:
+      connect_network: tcp
+      connect_address: 127.0.0.1:7777
+    agent:
+      mbus: nats://nats:nats-password@10.0.2.15:4222
+      blobstore:
+        provider: dav
+        options:
+          endpoint: http://10.0.2.15:25251
+          user: agent
+          password: agent-password
+
+  # warden job template
+  warden:
+    listen_network: tcp
+    listen_address: 0.0.0.0:7777
+    network_pool: 10.244.0.0/22 # bosh-lite v1 used this pool
+    disk_quota_enabled: false
+    kernel_network_tuning_enabled: false

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

@@ -68,5 +68,59 @@ jobs:
 				SHA1:    "ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65",
 			}))
 		})
+
+		It("returns manifest with given version/fingerprint/sha1 for jobs and packages if they were not base64 binary encoded", func() {
+			manifestBytes := []byte(`
+name: bosh
+version: 77
+
+commit_hash: bbe5476c
+uncommitted_changes: true
+
+packages:
+- name: registry
+  version: dd1ba330bc44b3181b263383b8e4252d7051deca
+  fingerprint: dd1ba330bc44b3181b263383b8e4252d7051deca
+  sha1: 6eaa6c961eac7bd994d1644ad405b3395420ecaf
+  dependencies: []
+
+jobs:
+- name: powerdns
+  version: 0b80b3c198bf7abc6c81262013de494369fd25b6
+  fingerprint: 0b80b3c198bf7abc6c81262013de494369fd25b6
+  sha1: ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65
+`)
+
+			manifest, err := NewManifestFromBytes(manifestBytes)
+			Expect(err).ToNot(HaveOccurred())
+
+			Expect(manifest.Release.Packages[0]).To(Equal(Package{
+				Name: "registry",
+
+				VersionRaw: "dd1ba330bc44b3181b263383b8e4252d7051deca",
+				Version:    "dd1ba330bc44b3181b263383b8e4252d7051deca",
+
+				FingerprintRaw: "dd1ba330bc44b3181b263383b8e4252d7051deca",
+				Fingerprint:    "dd1ba330bc44b3181b263383b8e4252d7051deca",
+
+				SHA1Raw: "6eaa6c961eac7bd994d1644ad405b3395420ecaf",
+				SHA1:    "6eaa6c961eac7bd994d1644ad405b3395420ecaf",
+
+				DependencyNames: []DependencyName{},
+			}))
+
+			Expect(manifest.Release.Jobs[0]).To(Equal(Job{
+				Name: "powerdns",
+
+				VersionRaw: "0b80b3c198bf7abc6c81262013de494369fd25b6",
+				Version:    "0b80b3c198bf7abc6c81262013de494369fd25b6",
+
+				FingerprintRaw: "0b80b3c198bf7abc6c81262013de494369fd25b6",
+				Fingerprint:    "0b80b3c198bf7abc6c81262013de494369fd25b6",
+
+				SHA1Raw: "ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65",
+				SHA1:    "ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65",
+			}))
+		})
 	})
 })

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

@@ -1,9 +1,9 @@
 package manifest
 
 import (
-	"encoding/base64"
-
 	bosherr "bosh/errors"
+
+	bputil "boshprovisioner/util"
 )
 
 // SyntaxValidator parses and saves all manifest values to determine
@@ -60,34 +60,34 @@ func (v SyntaxValidator) validateJob(job *Job) error {
 		return bosherr.New("Missing version")
 	}
 
-	bytes, err := base64.StdEncoding.DecodeString(job.VersionRaw)
+	str, err := bputil.DecodePossibleBase64Str(job.VersionRaw)
 	if err != nil {
 		return bosherr.WrapError(err, "Decoding base64 encoded version")
 	}
 
-	job.Version = string(bytes)
+	job.Version = str
 
 	if job.FingerprintRaw == "" {
 		return bosherr.New("Missing fingerprint")
 	}
 
-	bytes, err = base64.StdEncoding.DecodeString(job.FingerprintRaw)
+	str, err = bputil.DecodePossibleBase64Str(job.FingerprintRaw)
 	if err != nil {
 		return bosherr.WrapError(err, "Decoding base64 encoded fingerprint")
 	}
 
-	job.Fingerprint = string(bytes)
+	job.Fingerprint = str
 
 	if job.SHA1Raw == "" {
 		return bosherr.New("Missing sha1")
 	}
 
-	bytes, err = base64.StdEncoding.DecodeString(job.SHA1Raw)
+	str, err = bputil.DecodePossibleBase64Str(job.SHA1Raw)
 	if err != nil {
 		return bosherr.WrapError(err, "Decoding base64 encoded sha1")
 	}
 
-	job.SHA1 = string(bytes)
+	job.SHA1 = str
 
 	return nil
 }
@@ -101,34 +101,34 @@ func (v SyntaxValidator) validatePkg(pkg *Package) error {
 		return bosherr.New("Missing version")
 	}
 
-	bytes, err := base64.StdEncoding.DecodeString(pkg.VersionRaw)
+	str, err := bputil.DecodePossibleBase64Str(pkg.VersionRaw)
 	if err != nil {
 		return bosherr.WrapError(err, "Decoding base64 encoded version")
 	}
 
-	pkg.Version = string(bytes)
+	pkg.Version = str
 
 	if pkg.FingerprintRaw == "" {
 		return bosherr.New("Missing fingerprint")
 	}
 
-	bytes, err = base64.StdEncoding.DecodeString(pkg.FingerprintRaw)
+	str, err = bputil.DecodePossibleBase64Str(pkg.FingerprintRaw)
 	if err != nil {
 		return bosherr.WrapError(err, "Decoding base64 encoded fingerprint")
 	}
 
-	pkg.Fingerprint = string(bytes)
+	pkg.Fingerprint = str
 
 	if pkg.SHA1Raw == "" {
 		return bosherr.New("Missing sha1")
 	}
 
-	bytes, err = base64.StdEncoding.DecodeString(pkg.SHA1Raw)
+	str, err = bputil.DecodePossibleBase64Str(pkg.SHA1Raw)
 	if err != nil {
 		return bosherr.WrapError(err, "Decoding base64 encoded sha1")
 	}
 
-	pkg.SHA1 = string(bytes)
+	pkg.SHA1 = str
 
 	return nil
 }

data/go/src/boshprovisioner/util/possible_base64.go

@@ -0,0 +1,21 @@
+package util
+
+import (
+	"encoding/base64"
+
+	bosherr "bosh/errors"
+)
+
+func DecodePossibleBase64Str(str string) (string, error) {
+	// Cheating until yaml library provides proper support for !!binary
+	if str[len(str)-1:] == "=" {
+		bytes, err := base64.StdEncoding.DecodeString(str)
+		if err != nil {
+			return "", bosherr.WrapError(err, "Decoding base64 encoded str '%s'", str)
+		}
+
+		return string(bytes), nil
+	}
+
+	return str, nil
+}

data/lib/vagrant-bosh/config.rb

@@ -42,7 +42,7 @@ module VagrantPlugins
 
         @full_stemcell_compatibility = !!@full_stemcell_compatibility
 
-        @create_release_cmd ||= "bosh -n create release --force"
+        @create_release_cmd ||= "ruby -v; bosh -n create release --force"
       end
 
       def validate(machine)

data/lib/vagrant-bosh/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantBosh
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bosh
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dmitriy Kalinin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies: []
 description: BOSH provisioner allows to provision guest VM by specifying regular BOSH
   deployment manifest.
@@ -18,8 +18,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
+- ".gitignore"
+- ".gitmodules"
 - Gemfile
 - LICENSE
 - README.md
@@ -135,6 +135,7 @@ files:
 - go/src/boshprovisioner/tar/cmd_extractor.go
 - go/src/boshprovisioner/tar/compressor_interface.go
 - go/src/boshprovisioner/tar/extractor_interface.go
+- go/src/boshprovisioner/util/possible_base64.go
 - go/src/boshprovisioner/util/string_keyed.go
 - go/src/boshprovisioner/vm/vagrant/agent_provisioner.go
 - go/src/boshprovisioner/vm/vagrant/asset_manager.go
@@ -190,17 +191,17 @@ require_paths:
 - templates
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Vagrant BOSH provisioner plugin.