Merge branch 'alex-slynko-add_user_to_proxy'

README.md

@@ -36,6 +36,7 @@ resource_types:
 * `jumpbox_url`: *Optional.* The URL, including port, of the jumpbox. If set, `jumpbox_ssh_key` must also be set. If omitted,
   the BOSH director will be dialed directly.
 * `jumpbox_ssh_key`: *Optional.* The private key of the jumpbox. If set, `jumpbox_url` must also be set.
+* `jumpbox_username`: *Optional.* The username for the jumpbox. If not set, will default to `jumpbox`.
 * `vars_store`: *Optional.* Configuration for a persisted variables store. Currently only the Google Cloud Storage (GCS)
   provider is supported. `json_key` must be the the JSON key for your service account. Example:
 

bosh/cli_coordinator.go

@@ -20,7 +20,7 @@ import (
 
 //go:generate counterfeiter . Proxy
 type Proxy interface {
-	Start(string, string) error
+	Start(string, string, string) error
 	Addr() (string, error)
 }
 
@@ -97,7 +97,7 @@ func (c CLICoordinator) StartProxy() (string, error) {
 			return addr, nil
 		}
 
-		err = c.proxy.Start(c.source.JumpboxSSHKey, c.source.JumpboxURL)
+		err = c.proxy.Start(c.source.JumpboxUsername, c.source.JumpboxSSHKey, c.source.JumpboxURL)
 		if err != nil {
 			panic(err)
 		}

bosh/cli_coordinator_test.go

@@ -21,7 +21,7 @@ var _ = Describe("CLI coordinator", func() {
 		fakeProxy = &boshfakes.FakeProxy{}
 		fakeProxy.AddrReturns("some-proxy-addr", nil)
 		fakeProxy.AddrReturnsOnCall(0, "", errors.New("proxy is not running"))
-		source = concourse.Source{JumpboxSSHKey: "some-key", JumpboxURL: "some-url"}
+		source = concourse.Source{JumpboxUsername: "some-user", JumpboxSSHKey: "some-key", JumpboxURL: "some-url"}
 		cliCoordinator = bosh.NewCLICoordinator(source, GinkgoWriter, fakeProxy)
 	})
 
@@ -31,7 +31,8 @@ var _ = Describe("CLI coordinator", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(fakeProxy.StartCallCount()).To(Equal(1))
-			key, url := fakeProxy.StartArgsForCall(0)
+			username, key, url := fakeProxy.StartArgsForCall(0)
+			Expect(username).To(Equal("some-user"))
 			Expect(key).To(Equal("some-key"))
 			Expect(url).To(Equal("some-url"))
 

concourse/source.go

@@ -13,14 +13,15 @@ import (
 )
 
 type Source struct {
-	Deployment    string    `json:"deployment,omitempty" yaml:"deployment"`
-	Client        string    `json:"client,omitempty" yaml:"client"`
-	ClientSecret  string    `json:"client_secret,omitempty" yaml:"client_secret"`
-	Target        string    `json:"target,omitempty" yaml:"target"`
-	CACert        string    `json:"ca_cert,omitempty" yaml:"ca_cert"`
-	JumpboxSSHKey string    `json:"jumpbox_ssh_key,omitempty" yaml:"jumpbox_ssh_key"`
-	JumpboxURL    string    `json:"jumpbox_url,omitempty" yaml:"jumpbox_url"`
-	VarsStore     VarsStore `json:"vars_store,omitempty" yaml:"vars_store"`
+	Deployment      string    `json:"deployment,omitempty" yaml:"deployment"`
+	Client          string    `json:"client,omitempty" yaml:"client"`
+	ClientSecret    string    `json:"client_secret,omitempty" yaml:"client_secret"`
+	Target          string    `json:"target,omitempty" yaml:"target"`
+	CACert          string    `json:"ca_cert,omitempty" yaml:"ca_cert"`
+	JumpboxSSHKey   string    `json:"jumpbox_ssh_key,omitempty" yaml:"jumpbox_ssh_key"`
+	JumpboxURL      string    `json:"jumpbox_url,omitempty" yaml:"jumpbox_url"`
+	JumpboxUsername string    `json:"jumpbox_username,omitempty" yaml:"jumpbox_username"`
+	VarsStore       VarsStore `json:"vars_store,omitempty" yaml:"vars_store"`
 }
 
 type sourceRequest struct {