WIP: refactor openapi_client

Author: NautiluX

.mockery.yml

@@ -4,10 +4,11 @@
 all: false
 dir: '{{.InterfaceDir}}'
 force-file-write: true
+filename: 'mocks.go'
 formatter: gofmt
 log-level: info
 structname: '{{.Mock}}{{.InterfaceName}}'
-pkgname: '{{.SrcPackageName}}_test'
+pkgname: '{{.SrcPackageName}}'
 recursive: false
 require-template-schema-exists: true
 template: testify
@@ -16,3 +17,7 @@ packages:
   github.com/codesphere-cloud/cs-go/cmd:
     interfaces:
       Client:
+  github.com/codesphere-cloud/cs-go/api/openapi_client:
+    config:
+      all: true
+    interfaces:

Makefile

@@ -12,7 +12,7 @@ lint: install-build-deps
 test:
 	go test ./...
 
-generate: install-build-deps
+generate:
 	go generate ./...
 
 build:
@@ -25,7 +25,7 @@ install:
 generate-client:
 	rm -rf ${OPENAPI_DIR}
 	openapi-generator-cli generate -g go -o ${OPENAPI_DIR} -i https://codesphere.com/api/docs \
-	    --additional-properties=isGoSubmodule=true,withGoMod=false,packageName=openapi_client \
+	    --additional-properties=generateInterfaces=true,isGoSubmodule=true,withGoMod=false,packageName=openapi_client \
 		--type-mappings=integer=int \
 	    --template-dir openapi-template \
 	    --skip-validate-spec # TODO: remove once the Codesphere openapi spec is fixed

api/client.go

@@ -34,16 +34,19 @@ func (c Configuration) GetApiUrl() *url.URL {
 	return defaultUrl
 }
 
+func NewClientWithCustomApi(ctx context.Context, opts Configuration, api *openapi_client.APIClient) *Client {
+	return &Client{
+		ctx: context.WithValue(ctx, openapi_client.ContextAccessToken, opts.Token),
+		api: api,
+	}
+}
+
 func NewClient(ctx context.Context, opts Configuration) *Client {
 	cfg := openapi_client.NewConfiguration()
 	cfg.Servers = []openapi_client.ServerConfiguration{{
 		URL: opts.BaseUrl.String(),
 	}}
-
-	return &Client{
-		ctx: context.WithValue(ctx, openapi_client.ContextAccessToken, opts.Token),
-		api: openapi_client.NewAPIClient(cfg),
-	}
+	return NewClientWithCustomApi(ctx, opts, openapi_client.NewAPIClient(cfg))
 }
 
 func (c *Client) ListDataCenters() ([]DataCenter, error) {
@@ -104,10 +107,9 @@ func (c *Client) DeleteDomain(teamId int, domainName string) error {
 func (c *Client) UpdateDomain(
 	teamId int, domainName string, args UpdateDomainArgs,
 ) (*Domain, error) {
-	domain, _, err := c.api.DomainsAPI.
-		DomainsUpdateDomain(c.ctx, float32(teamId), domainName).
-		DomainsGetDomain200ResponseCustomConfig(args).
-		Execute()
+	domain, _, err := c.api.DomainsAPI.DomainsUpdateDomainExecute(
+		c.api.DomainsAPI.DomainsUpdateDomain(c.ctx, float32(teamId), domainName).
+			DomainsGetDomain200ResponseCustomConfig(args))
 	return domain, err
 }
 
@@ -135,36 +137,3 @@ func (c *Client) UpdateWorkspaceConnections(
 		RequestBody(req).Execute()
 	return domain, err
 }
-
-func (c *Client) ListWorkspaces(teamId int) ([]Workspace, error) {
-	workspaces, _, err := c.api.WorkspacesAPI.WorkspacesListWorkspaces(c.ctx, float32(teamId)).Execute()
-	return workspaces, err
-}
-
-func (c *Client) WorkspaceStatus(workspaceId int) (*WorkspaceStatus, error) {
-	status, _, err := c.api.WorkspacesAPI.WorkspacesGetWorkspaceStatus(c.ctx, float32(workspaceId)).Execute()
-	return status, err
-}
-
-func (c *Client) CreateWorkspace(args CreateWorkspaceArgs) (*Workspace, error) {
-	workspace, _, err := c.api.WorkspacesAPI.
-		WorkspacesCreateWorkspace(c.ctx).
-		WorkspacesCreateWorkspaceRequest(args).
-		Execute()
-	return workspace, err
-}
-
-func (c *Client) SetEnvVarOnWorkspace(workspaceId int, envVars map[string]string) error {
-	vars := []openapi_client.WorkspacesListEnvVars200ResponseInner{}
-	for k, v := range envVars {
-		vars = append(vars, openapi_client.WorkspacesListEnvVars200ResponseInner{
-			Name:  k,
-			Value: v,
-		})
-	}
-	_, err := c.api.WorkspacesAPI.
-		WorkspacesSetEnvVar(c.ctx, float32(workspaceId)).
-		WorkspacesListEnvVars200ResponseInner(vars).
-		Execute()
-	return err
-}