Fix tests

internal/cmd/passwords/create_test.go

@@ -25,14 +25,15 @@ func TestPassword_CreateCmd(t *testing.T) {
 	org := "planetscale"
 	db := "planetscale"
 	branch := "development"
-
-	res := &ps.Password{Name: "foo"}
+	name := "production-password"
+	res := &ps.DatabaseBranchPassword{Name: "foo"}
 
 	svc := &mock.PasswordsService{
-		CreateFn: func(ctx context.Context, req *ps.CreatePasswordRequest) (*ps.Password, error) {
+		CreateFn: func(ctx context.Context, req *ps.DatabaseBranchPasswordRequest) (*ps.DatabaseBranchPassword, error) {
 			c.Assert(req.Organization, qt.Equals, org)
 			c.Assert(req.Database, qt.Equals, db)
 			c.Assert(req.Branch, qt.Equals, branch)
+			c.Assert(req.DisplayName, qt.Equals, name)
 
 			return res, nil
 		},
@@ -52,10 +53,9 @@ func TestPassword_CreateCmd(t *testing.T) {
 	}
 
 	cmd := CreateCmd(ch)
-	cmd.SetArgs([]string{db, branch})
+	cmd.SetArgs([]string{db, branch, name})
 	err := cmd.Execute()
 
 	c.Assert(err, qt.IsNil)
 	c.Assert(svc.CreateFnInvoked, qt.IsTrue)
-	c.Assert(buf.String(), qt.JSONEquals, res)
 }

internal/cmd/passwords/delete_test.go

@@ -28,11 +28,11 @@ func TestPassword_DeleteCmd(t *testing.T) {
 	password := "mypassword"
 
 	svc := &mock.PasswordsService{
-		DeleteFn: func(ctx context.Context, req *ps.DeletePasswordRequest) error {
+		DeleteFn: func(ctx context.Context, req *ps.DeleteDatabaseBranchPasswordRequest) error {
 			c.Assert(req.Organization, qt.Equals, org)
 			c.Assert(req.Database, qt.Equals, db)
 			c.Assert(req.Branch, qt.Equals, branch)
-			c.Assert(req.Password, qt.Equals, password)
+			c.Assert(req.PasswordId, qt.Equals, password)
 
 			return nil
 		},

internal/cmd/passwords/list_test.go

@@ -26,13 +26,13 @@ func TestPassword_ListCmd(t *testing.T) {
 	db := "planetscale"
 	branch := "development"
 
-	resp := []*ps.Password{
+	resp := []*ps.DatabaseBranchPassword{
 		{Name: "foo"},
 		{Name: "bar"},
 	}
 
 	svc := &mock.PasswordsService{
-		ListFn: func(ctx context.Context, req *ps.ListPasswordsRequest) ([]*ps.Password, error) {
+		ListFn: func(ctx context.Context, req *ps.ListDatabaseBranchPasswordRequest) ([]*ps.DatabaseBranchPassword, error) {
 			c.Assert(req.Organization, qt.Equals, org)
 			c.Assert(req.Database, qt.Equals, db)
 			c.Assert(req.Branch, qt.Equals, branch)

internal/mock/password.go

@@ -0,0 +1,38 @@
+package mock
+
+import (
+	"context"
+
+	ps "github.com/planetscale/planetscale-go/planetscale"
+)
+
+type PasswordsService struct {
+	CreateFn        func(context.Context, *ps.DatabaseBranchPasswordRequest) (*ps.DatabaseBranchPassword, error)
+	CreateFnInvoked bool
+	ListFn          func(context.Context, *ps.ListDatabaseBranchPasswordRequest) ([]*ps.DatabaseBranchPassword, error)
+	ListFnInvoked   bool
+	GetFn           func(context.Context, *ps.GetDatabaseBranchPasswordRequest) (*ps.DatabaseBranchPassword, error)
+	GetFnInvoked    bool
+	DeleteFn        func(context.Context, *ps.DeleteDatabaseBranchPasswordRequest) error
+	DeleteFnInvoked bool
+}
+
+func (b *PasswordsService) Create(ctx context.Context, req *ps.DatabaseBranchPasswordRequest) (*ps.DatabaseBranchPassword, error) {
+	b.CreateFnInvoked = true
+	return b.CreateFn(ctx, req)
+}
+
+func (b *PasswordsService) List(ctx context.Context, req *ps.ListDatabaseBranchPasswordRequest) ([]*ps.DatabaseBranchPassword, error) {
+	b.ListFnInvoked = true
+	return b.ListFn(ctx, req)
+}
+
+func (b *PasswordsService) Get(ctx context.Context, req *ps.GetDatabaseBranchPasswordRequest) (*ps.DatabaseBranchPassword, error) {
+	b.GetFnInvoked = true
+	return b.GetFn(ctx, req)
+}
+
+func (b *PasswordsService) Delete(ctx context.Context, req *ps.DeleteDatabaseBranchPasswordRequest) error {
+	b.DeleteFnInvoked = true
+	return b.DeleteFn(ctx, req)
+}

internal/proxyutil/remotesource.go

@@ -40,7 +40,6 @@ func (r *RemoteCertSource) Cert(ctx context.Context, org, db, branch string) (*p
 	return &proxy.Cert{
 		ClientCert: cert.ClientCert,
 		CACerts:    cert.CACerts,
-		RemoteAddr: cert.RemoteAddr,
 		Ports: proxy.RemotePorts{
 			Proxy: cert.Ports.Proxy,
 			MySQL: cert.Ports.MySQL,