package common

import (
	bosherr "github.com/cloudfoundry/bosh-utils/errors"
)

type AgentOptions struct {
	// e.g. "https://user:password@127.0.0.1:4321/agent"
	Mbus string

	// e.g. ["0.us.pool.ntp.org"]. Ok to be empty
	NTP []string

	Blobstore BlobstoreOptions

	//The SHA-512 encrypted vcap password
	VcapPassword string
}

type RegistryOptions struct {
	Host     string
	Port     int
	Username string
	Password string
}

type BlobstoreOptions struct {
	Provider string                 `json:"provider"`
	Options  map[string]interface{} `json:"options"`
}

func (o AgentOptions) Validate() error {
	if o.Mbus == "" {
		return bosherr.Error("Must provide non-empty Mbus")
	}

	err := o.Blobstore.Validate()
	if err != nil {
		return bosherr.WrapError(err, "Validating Blobstore configuration")
	}

	return nil
}

func (o BlobstoreOptions) Validate() error {
	if o.Provider == "" {
		return bosherr.Error("Must provide non-empty provider")
	}

	return nil
}

package common

import (
	bosherr "github.com/cloudfoundry/bosh-utils/errors"
)

type AgentOptions struct {
	// e.g. "https://user:password@127.0.0.1:4321/agent"
	Mbus string

	// e.g. ["0.us.pool.ntp.org"]. Ok to be empty
	NTP []string

	Blobstore BlobstoreOptions

	//vcap password
	VcapPassword string
}

type RegistryOptions struct {
	Host     string
	Port     int
	Username string
	Password string
}

type BlobstoreOptions struct {
	Provider string                 `json:"provider"`
	Options  map[string]interface{} `json:"options"`
}

func (o AgentOptions) Validate() error {
	if o.Mbus == "" {
		return bosherr.Error("Must provide non-empty Mbus")
	}

	err := o.Blobstore.Validate()
	if err != nil {
		return bosherr.WrapError(err, "Validating Blobstore configuration")
	}

	return nil
}

func (o BlobstoreOptions) Validate() error {
	if o.Provider == "" {
		return bosherr.Error("Must provide non-empty provider")
	}

	return nil
}

--- 
+++ 
@@ -13,7 +13,7 @@
 
 	Blobstore BlobstoreOptions
 
-	//vcap password
+	//The SHA-512 encrypted vcap password
 	VcapPassword string
 }
 
Update the comment for VcapPassword
