chore: remove redundant jsonapiclient interface

leg100 · Oct 29, 2023 · 5aa153a · 5aa153a
1 parent eceab7e
commit 5aa153a
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 48 deletions.
diff --git a/internal/agent/client.go b/internal/agent/client.go
@@ -88,12 +88,12 @@ func newClient(config ExternalConfig) (*remoteClient, error) {
 
 	return &remoteClient{
 		Client:          api,
-		stateClient:     &stateClient{JSONAPIClient: api},
-		configClient:    &configClient{JSONAPIClient: api},
-		variableClient:  &variableClient{JSONAPIClient: api},
-		tokensClient:    &tokensClient{JSONAPIClient: api},
-		workspaceClient: &workspaceClient{JSONAPIClient: api},
-		runClient:       &runClient{JSONAPIClient: api, Config: config.APIConfig},
-		logsClient:      &logsClient{JSONAPIClient: api},
+		stateClient:     &stateClient{Client: api},
+		configClient:    &configClient{Client: api},
+		variableClient:  &variableClient{Client: api},
+		tokensClient:    &tokensClient{Client: api},
+		workspaceClient: &workspaceClient{Client: api},
+		runClient:       &runClient{Client: api, Config: config.APIConfig},
+		logsClient:      &logsClient{Client: api},
 	}, nil
 }
diff --git a/internal/auth/client.go b/internal/auth/client.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/leg100/otf/internal"
+	otfapi "github.com/leg100/otf/internal/api"
 )
 
 type (
 	Client struct {
-		internal.JSONAPIClient
+		*otfapi.Client
 
 		AuthService
 	}

diff --git a/internal/auth/team_cli.go b/internal/auth/team_cli.go
@@ -22,7 +22,7 @@ func NewTeamCommand(api *otfapi.Client) *cobra.Command {
 			if err := cmd.Parent().PersistentPreRunE(cmd.Parent(), args); err != nil {
 				return err
 			}
-			cli.AuthService = &Client{JSONAPIClient: api}
+			cli.AuthService = &Client{Client: api}
 			return nil
 		},
 	}

diff --git a/internal/auth/user_cli.go b/internal/auth/user_cli.go
@@ -20,7 +20,7 @@ func NewUserCommand(api *otfapi.Client) *cobra.Command {
 			if err := cmd.Parent().PersistentPreRunE(cmd.Parent(), args); err != nil {
 				return err
 			}
-			cli.UserService = &Client{JSONAPIClient: api}
+			cli.UserService = &Client{Client: api}
 			return nil
 		},
 	}

diff --git a/internal/configversion/client.go b/internal/configversion/client.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/leg100/otf/internal"
+	otfapi "github.com/leg100/otf/internal/api"
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 
 	// Client does not implement all of service yet
 	Service

diff --git a/internal/jsonapi.go b/internal/jsonapi.go
diff --git a/internal/logs/client.go b/internal/logs/client.go
@@ -7,10 +7,11 @@ import (
 	"strconv"
 
 	"github.com/leg100/otf/internal"
+	otfapi "github.com/leg100/otf/internal/api"
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 }
 
 func (c *Client) PutChunk(ctx context.Context, opts internal.PutChunkOptions) error {

diff --git a/internal/organization/cli.go b/internal/organization/cli.go
@@ -21,7 +21,7 @@ func NewCommand(api *otfapi.Client) *cobra.Command {
 			if err := cmd.Parent().PersistentPreRunE(cmd.Parent(), args); err != nil {
 				return err
 			}
-			cli.Service = &Client{JSONAPIClient: api}
+			cli.Service = &Client{Client: api}
 			return nil
 		},
 	}

diff --git a/internal/organization/client.go b/internal/organization/client.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/leg100/otf/internal"
+	otfapi "github.com/leg100/otf/internal/api"
 	"github.com/leg100/otf/internal/resource"
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 
 	Service
 }

diff --git a/internal/run/cli.go b/internal/run/cli.go
@@ -28,8 +28,8 @@ func NewCommand(api *otfapi.Client) *cobra.Command {
 			if err := cmd.Parent().PersistentPreRunE(cmd.Parent(), args); err != nil {
 				return err
 			}
-			cli.Service = &Client{JSONAPIClient: api}
-			cli.ConfigurationVersionService = &configversion.Client{JSONAPIClient: api}
+			cli.Service = &Client{Client: api}
+			cli.ConfigurationVersionService = &configversion.Client{Client: api}
 			return nil
 		},
 	}

diff --git a/internal/run/client.go b/internal/run/client.go
@@ -18,7 +18,7 @@ import (
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 	otfapi.Config
 
 	// Client does not implement all of service yet

diff --git a/internal/state/cli.go b/internal/state/cli.go
@@ -27,8 +27,8 @@ func NewCommand(api *otfapi.Client) *cobra.Command {
 			if err := cmd.Parent().PersistentPreRunE(cmd.Parent(), args); err != nil {
 				return err
 			}
-			cli.Service = &Client{JSONAPIClient: api}
-			cli.WorkspaceService = &workspace.Client{JSONAPIClient: api}
+			cli.Service = &Client{Client: api}
+			cli.WorkspaceService = &workspace.Client{Client: api}
 			return nil
 		},
 	}

diff --git a/internal/state/client.go b/internal/state/client.go
@@ -9,12 +9,13 @@ import (
 	"net/url"
 
 	"github.com/leg100/otf/internal"
+	otfapi "github.com/leg100/otf/internal/api"
 	"github.com/leg100/otf/internal/resource"
 	"github.com/leg100/otf/internal/tfeapi/types"
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 
 	// Client does not implement all of service yet
 	Service

diff --git a/internal/tokens/cli.go b/internal/tokens/cli.go
@@ -21,7 +21,7 @@ func NewAgentsCommand(api *otfapi.Client) *cobra.Command {
 			if err := cmd.Parent().PersistentPreRunE(cmd.Parent(), args); err != nil {
 				return err
 			}
-			cli.TokensService = &Client{JSONAPIClient: api}
+			cli.TokensService = &Client{Client: api}
 			return nil
 		},
 	}

diff --git a/internal/tokens/client.go b/internal/tokens/client.go
@@ -5,19 +5,17 @@ import (
 	"context"
 
 	otfapi "github.com/leg100/otf/internal/api"
-
-	"github.com/leg100/otf/internal"
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 
 	// client doesn't implement all of service yet
 	TokensService
 }
 
 func NewClient(api *otfapi.Client) (*Client, error) {
-	return &Client{JSONAPIClient: api}, nil
+	return &Client{Client: api}, nil
 }
 
 func (c *Client) CreateRunToken(ctx context.Context, opts CreateRunTokenOptions) ([]byte, error) {

diff --git a/internal/variable/client.go b/internal/variable/client.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/leg100/otf/internal"
+	otfapi "github.com/leg100/otf/internal/api"
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 }
 
 func (c *Client) ListEffectiveVariables(ctx context.Context, runID string) ([]*Variable, error) {

diff --git a/internal/workspace/cli.go b/internal/workspace/cli.go
@@ -23,7 +23,7 @@ func NewCommand(api *otfapi.Client) *cobra.Command {
 			if err := cmd.Parent().PersistentPreRunE(cmd.Parent(), args); err != nil {
 				return err
 			}
-			cli.Service = &Client{JSONAPIClient: api}
+			cli.Service = &Client{Client: api}
 			return nil
 		},
 	}

diff --git a/internal/workspace/client.go b/internal/workspace/client.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/leg100/otf/internal"
+	otfapi "github.com/leg100/otf/internal/api"
 	"github.com/leg100/otf/internal/resource"
 )
 
 type Client struct {
-	internal.JSONAPIClient
+	*otfapi.Client
 
 	WorkspaceService
 }