client interface

9 files changed, 17 insertions, 17 deletions

diff --git a/cmd/lulu/cancel.go b/cmd/lulu/cancel.go
index 4e5d3b1..38b95b7 100644
--- a/cmd/lulu/cancel.go
+++ b/cmd/lulu/cancel.go
@@ -6,6 +6,6 @@ type CancelCmd struct {
 	Id uint64 `arg help:"ID of the job to cancel"`
 }
 
-func (cmd CancelCmd) Run(clnt *lulu.Client) error {
+func (cmd CancelCmd) Run(clnt lulu.Client) error {
 	return clnt.Cancel(cmd.Id)
 }
diff --git a/cmd/lulu/cd.go b/cmd/lulu/cd.go
index 8af670e..3d3a57f 100644
--- a/cmd/lulu/cd.go
+++ b/cmd/lulu/cd.go
@@ -12,7 +12,7 @@ type CoverDimensionsCmd struct {
 	Unit   lulu.Unit  `short:"u" default:"pt" help:"${unit_help}"`
 }
 
-func (cmd CoverDimensionsCmd) Run(clnt *lulu.Client) error {
+func (cmd CoverDimensionsCmd) Run(clnt lulu.Client) error {
 	dims, err := clnt.CoverDimensions(cmd.Mfg, cmd.NPages, cmd.Unit)
 	if err != nil {
 		return err
diff --git a/cmd/lulu/cost.go b/cmd/lulu/cost.go
index 1ef655d..575ea38 100644
--- a/cmd/lulu/cost.go
+++ b/cmd/lulu/cost.go
@@ -19,7 +19,7 @@ type CostCmd struct {
 	Items []CostLineItem     `required help:"${cost_item_help}"`
 }
 
-func (cmd *CostCmd) Run(cli *kong.Kong, clnt *lulu.Client) error {
+func (cmd *CostCmd) Run(cli *kong.Kong, clnt lulu.Client) error {
 	items := make([]lulu.CostLineItem, len(cmd.Items))
 	for i := range cmd.Items {
 		items[i] = cmd.Items[i].CostLineItem
diff --git a/cmd/lulu/job.go b/cmd/lulu/job.go
index b12fbe7..a4c7fa9 100644
--- a/cmd/lulu/job.go
+++ b/cmd/lulu/job.go
@@ -13,7 +13,7 @@ type JobCmd struct {
 	Id uint64 `arg help:"ID of the job to retrieve"`
 }
 
-func (cmd JobCmd) Run(clnt *lulu.Client) error {
+func (cmd JobCmd) Run(clnt lulu.Client) error {
 	job, err := clnt.Job(cmd.Id)
 	if err != nil {
 		return err
diff --git a/cmd/lulu/jobs.go b/cmd/lulu/jobs.go
index 98d656b..eb23762 100644
--- a/cmd/lulu/jobs.go
+++ b/cmd/lulu/jobs.go
@@ -18,7 +18,7 @@ type JobsCmd struct {
 	Status         lulu.OrderStatus `help:"${order_status_help}"`
 }
 
-func (cmd JobsCmd) Run(clnt *lulu.Client) error {
+func (cmd JobsCmd) Run(clnt lulu.Client) error {
 	jobs, err := clnt.Jobs(cmd.queries()...)
 	if err != nil {
 		return err
diff --git a/cmd/lulu/main.go b/cmd/lulu/main.go
index 45a5bef..bd17b77 100644
--- a/cmd/lulu/main.go
+++ b/cmd/lulu/main.go
@@ -19,7 +19,6 @@ func main() {
 			NoExpandSubcommands: true,
 		}),
 	)
-
 	lulu.Debug = cli.Debug
 
 	creds, err := readCreds(cli.Sandbox)
@@ -30,7 +29,8 @@ func main() {
 	}
 	clnt, err := newClient(context.Background(), creds)
 	ctx.FatalIfErrorf(err)
+	ctx.BindTo(clnt, (*lulu.Client)(nil)) // use BindTo to make kong work with interfaces
 
-	err = ctx.Run(cli.Globals, clnt)
+	err = ctx.Run(cli.Globals)
 	ctx.FatalIfErrorf(err)
 }
diff --git a/cmd/lulu/print.go b/cmd/lulu/print.go
index cbd536e..23d3752 100644
--- a/cmd/lulu/print.go
+++ b/cmd/lulu/print.go
@@ -19,7 +19,7 @@ type PrintCmd struct {
 	Items []Printable        `required placeholder:"PRINTABLE" help:"${printable_help}"`
 }
 
-func (cmd PrintCmd) Run(clnt *lulu.Client) error {
+func (cmd PrintCmd) Run(clnt lulu.Client) error {
 	items := make([]lulu.Printable, len(cmd.Items))
 	for i := range cmd.Items {
 		items[i] = lulu.Printable(cmd.Items[i])
diff --git a/cmd/lulu/vc.go b/cmd/lulu/vc.go
index 5a2a84f..78d9670 100644
--- a/cmd/lulu/vc.go
+++ b/cmd/lulu/vc.go
@@ -18,10 +18,10 @@ type ValidateCoverCmd struct {
 	Timeout time.Duration `short:"t" default:"${default_timeout}"`
 }
 
-func (cmd ValidateCoverCmd) Run(cli *kong.Kong, clnt *lulu.Client) error {
-	ctx, cancel := context.WithTimeout(clnt.Context(), cmd.Timeout)
+func (cmd ValidateCoverCmd) Run(cli *kong.Kong, clnt lulu.Client) error {
+	ctx, cancel := context.WithTimeout(context.Background(), cmd.Timeout)
 	defer cancel()
-	val, err := clnt.ValidateCover(ctx, cmd.Url.String(), cmd.Mfg, cmd.NPages)
+	val, err := lulu.ValidateCover(ctx, clnt, cmd.Url.String(), cmd.Mfg, cmd.NPages)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/lulu/vi.go b/cmd/lulu/vi.go
index 27e26ab..38f9d35 100644
--- a/cmd/lulu/vi.go
+++ b/cmd/lulu/vi.go
@@ -26,9 +26,9 @@ type ValidateInteriorBasicCmd struct {
 	Url *url.URL `arg help:"Location of interior file"`
 }
 
-func (cmd ValidateInteriorBasicCmd) Run(cli *kong.Kong, clnt *lulu.Client, timeout time.Duration) error {
+func (cmd ValidateInteriorBasicCmd) Run(cli *kong.Kong, clnt lulu.Client, timeout time.Duration) error {
 	return validateInterior(cli, clnt, timeout, func(ctx context.Context) (lulu.InteriorValidation, error) {
-		return clnt.ValidateInteriorBasic(ctx, cmd.Url.String())
+		return lulu.ValidateInteriorBasic(ctx, clnt, cmd.Url.String())
 	}, lulu.InteriorStatusValidated)
 }
 
@@ -37,14 +37,14 @@ type ValidateInteriorFullCmd struct {
 	Mfg lulu.PkgId `arg  help:"${mfg_help}"`
 }
 
-func (cmd ValidateInteriorFullCmd) Run(cli *kong.Kong, clnt *lulu.Client, timeout time.Duration) error {
+func (cmd ValidateInteriorFullCmd) Run(cli *kong.Kong, clnt lulu.Client, timeout time.Duration) error {
 	return validateInterior(cli, clnt, timeout, func(ctx context.Context) (lulu.InteriorValidation, error) {
-		return clnt.ValidateInterior(ctx, cmd.Url.String(), cmd.Mfg)
+		return lulu.ValidateInterior(ctx, clnt, cmd.Url.String(), cmd.Mfg)
 	}, lulu.InteriorStatusNormalized)
 }
 
-func validateInterior(cli *kong.Kong, clnt *lulu.Client, timeout time.Duration, validate func(ctx context.Context) (lulu.InteriorValidation, error), wantStatus lulu.InteriorValidationStatus) error {
-	ctx, cancel := context.WithTimeout(clnt.Context(), timeout)
+func validateInterior(cli *kong.Kong, clnt lulu.Client, timeout time.Duration, validate func(ctx context.Context) (lulu.InteriorValidation, error), wantStatus lulu.InteriorValidationStatus) error {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 	val, err := validate(ctx)
 	if err != nil {