Export entclient to coder-sdk

cmoog · cmoog · commit 9974e45ca37c · 2020-08-16T20:05:16.000-05:00
diff --git a/ci/integration/users_test.go b/ci/integration/users_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"cdr.dev/coder-cli/ci/tcli"
-	"cdr.dev/coder-cli/internal/entclient"
+	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/slog/sloggers/slogtest/assert"
 )
 
@@ -20,7 +20,7 @@ func TestUsers(t *testing.T) {
 
 		headlessLogin(ctx, t, c)
 
-		var user entclient.User
+		var user coder.User
 		c.Run(ctx, `coder users ls --output json | jq -c '.[] | select( .username == "charlie")'`).Assert(t,
 			tcli.Success(),
 			tcli.StdoutJSONUnmarshal(&user),
diff --git a/coder-sdk/activity.go b/coder-sdk/activity.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"context"
diff --git a/coder-sdk/client.go b/coder-sdk/client.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"net/http"
diff --git a/coder-sdk/devurl.go b/coder-sdk/devurl.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"context"
diff --git a/coder-sdk/env.go b/coder-sdk/env.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"context"
@@ -34,12 +34,12 @@ type Environment struct {
 	AutoOffThreshold xjson.Duration `json:"auto_off_threshold" tab:"-"`
 }
 
-// EnvironmentsInOrganization gets the list of environments owned by the authenticated user
-func (c Client) EnvironmentsInOrganization(ctx context.Context, user *User, org *Org) ([]Environment, error) {
+// EnvironmentsByOrganization gets the list of environments owned by the given user.
+func (c Client) EnvironmentsByOrganization(ctx context.Context, userID, orgID string) ([]Environment, error) {
 	var envs []Environment
 	err := c.requestBody(
 		ctx,
-		http.MethodGet, "/api/orgs/"+org.ID+"/members/"+user.ID+"/environments",
+		http.MethodGet, "/api/orgs/"+orgID+"/members/"+userID+"/environments",
 		nil,
 		&envs,
 	)
diff --git a/coder-sdk/error.go b/coder-sdk/error.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"encoding/json"
diff --git a/coder-sdk/org.go b/coder-sdk/org.go
@@ -1,6 +1,9 @@
-package entclient
+package coder
 
-import "context"
+import (
+	"context"
+	"net/http"
+)
 
 // Org describes an Organization in Coder
 type Org struct {
@@ -12,6 +15,6 @@ type Org struct {
 // Orgs gets all Organizations
 func (c Client) Orgs(ctx context.Context) ([]Org, error) {
 	var os []Org
-	err := c.requestBody(ctx, "GET", "/api/orgs", nil, &os)
+	err := c.requestBody(ctx, http.MethodGet, "/api/orgs", nil, &os)
 	return os, err
 }
diff --git a/coder-sdk/request.go b/coder-sdk/request.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"bytes"
diff --git a/coder-sdk/secrets.go b/coder-sdk/secrets.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"context"
@@ -17,38 +17,42 @@ type Secret struct {
 }
 
 // Secrets gets all secrets for the given user
-func (c *Client) Secrets(ctx context.Context, user *User) ([]Secret, error) {
+func (c *Client) Secrets(ctx context.Context, userID string) ([]Secret, error) {
 	var secrets []Secret
-	err := c.requestBody(ctx, http.MethodGet, "/api/users/"+user.ID+"/secrets", nil, &secrets)
+	err := c.requestBody(ctx, http.MethodGet, "/api/users/"+userID+"/secrets", nil, &secrets)
 	return secrets, err
 }
 
-func (c *Client) secretByID(ctx context.Context, id string, user *User) (*Secret, error) {
+// SecretWithValueByName gets the Coder secret with its value by its name.
+func (c *Client) SecretWithValueByName(ctx context.Context, name, userID string) (*Secret, error) {
+	s, err := c.SecretByName(ctx, name, userID)
+	if err != nil {
+		return nil, err
+	}
 	var secret Secret
-	err := c.requestBody(ctx, http.MethodGet, "/api/users/"+user.ID+"/secrets/"+id, nil, &secret)
+	err = c.requestBody(ctx, http.MethodGet, "/api/users/"+userID+"/secrets/"+s.ID, nil, &secret)
 	return &secret, err
 }
 
-func (c *Client) secretNameToID(ctx context.Context, name string, user *User) (id string, _ error) {
-	secrets, err := c.Secrets(ctx, user)
-	if err != nil {
-		return "", err
-	}
-	for _, s := range secrets {
-		if s.Name == name {
-			return s.ID, nil
-		}
-	}
-	return "", ErrNotFound
+// SecretWithValueByID gets the Coder secret with its value by the secret_id.
+func (c *Client) SecretWithValueByID(ctx context.Context, id, userID string) (*Secret, error) {
+	var secret Secret
+	err := c.requestBody(ctx, http.MethodGet, "/api/users/"+userID+"/secrets/"+id, nil, &secret)
+	return &secret, err
 }
 
 // SecretByName gets a secret object by name
-func (c *Client) SecretByName(ctx context.Context, name string, user *User) (*Secret, error) {
-	id, err := c.secretNameToID(ctx, name, user)
+func (c *Client) SecretByName(ctx context.Context, name, userID string) (*Secret, error) {
+	secrets, err := c.Secrets(ctx, userID)
 	if err != nil {
 		return nil, err
 	}
-	return c.secretByID(ctx, id, user)
+	for _, s := range secrets {
+		if s.Name == name {
+			return &s, nil
+		}
+	}
+	return nil, ErrNotFound
 }
 
 // InsertSecretReq describes the request body for creating a new secret
@@ -65,11 +69,11 @@ func (c *Client) InsertSecret(ctx context.Context, user *User, req InsertSecretR
 }
 
 // DeleteSecretByName deletes the authenticated users secret with the given name
-func (c *Client) DeleteSecretByName(ctx context.Context, name string, user *User) error {
-	id, err := c.secretNameToID(ctx, name, user)
+func (c *Client) DeleteSecretByName(ctx context.Context, name, userID string) error {
+	secret, err := c.SecretByName(ctx, name, userID)
 	if err != nil {
 		return err
 	}
-	_, err = c.request(ctx, http.MethodDelete, "/api/users/"+user.ID+"/secrets/"+id, nil)
+	_, err = c.request(ctx, http.MethodDelete, "/api/users/"+userID+"/secrets/"+secret.ID, nil)
 	return err
 }
diff --git a/coder-sdk/users.go b/coder-sdk/users.go
@@ -1,4 +1,4 @@
-package entclient
+package coder
 
 import (
 	"context"
diff --git a/internal/activity/pusher.go b/internal/activity/pusher.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"cdr.dev/coder-cli/internal/entclient"
+	"cdr.dev/coder-cli/coder-sdk"
 	"golang.org/x/time/rate"
 
 	"go.coder.com/flog"
@@ -18,12 +18,12 @@ type Pusher struct {
 	envID  string
 	source string
 
-	client *entclient.Client
+	client *coder.Client
 	rate   *rate.Limiter
 }
 
 // NewPusher instantiates a new instance of Pusher
-func NewPusher(c *entclient.Client, envID, source string) *Pusher {
+func NewPusher(c *coder.Client, envID, source string) *Pusher {
 	return &Pusher{
 		envID:  envID,
 		source: source,
diff --git a/internal/cmd/auth.go b/internal/cmd/auth.go
@@ -3,23 +3,23 @@ package cmd
 import (
 	"net/url"
 
+	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/config"
-	"cdr.dev/coder-cli/internal/entclient"
 	"golang.org/x/xerrors"
 
 	"go.coder.com/flog"
 )
 
 // requireAuth exits the process with a nonzero exit code if the user is not authenticated to make requests
-func requireAuth() *entclient.Client {
+func requireAuth() *coder.Client {
 	client, err := newClient()
 	if err != nil {
 		flog.Fatal("%v", err)
 	}
 	return client
 }
 
-func newClient() (*entclient.Client, error) {
+func newClient() (*coder.Client, error) {
 	sessionToken, err := config.Session.Read()
 	if err != nil {
 		return nil, xerrors.Errorf("read session: %v (did you run coder login?)", err)
@@ -35,7 +35,7 @@ func newClient() (*entclient.Client, error) {
 		return nil, xerrors.Errorf("url misformatted: %v (try runing coder login)", err)
 	}
 
-	client := &entclient.Client{
+	client := &coder.Client{
 		BaseURL: u,
 		Token:   sessionToken,
 	}
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -3,18 +3,17 @@ package cmd
 import (
 	"context"
 
+	"cdr.dev/coder-cli/coder-sdk"
 	"golang.org/x/xerrors"
 
 	"go.coder.com/flog"
-
-	"cdr.dev/coder-cli/internal/entclient"
 )
 
 // Helpers for working with the Coder Enterprise API.
 
 // userOrgs gets a list of orgs the user is apart of.
-func userOrgs(user *entclient.User, orgs []entclient.Org) []entclient.Org {
-	var uo []entclient.Org
+func userOrgs(user *coder.User, orgs []coder.Org) []coder.Org {
+	var uo []coder.Org
 outer:
 	for _, org := range orgs {
 		for _, member := range org.Members {
@@ -29,7 +28,7 @@ outer:
 }
 
 // getEnvs returns all environments for the user.
-func getEnvs(ctx context.Context, client *entclient.Client, email string) ([]entclient.Environment, error) {
+func getEnvs(ctx context.Context, client *coder.Client, email string) ([]coder.Environment, error) {
 	user, err := client.UserByEmail(ctx, email)
 	if err != nil {
 		return nil, xerrors.Errorf("get user: %+v", err)
@@ -42,10 +41,10 @@ func getEnvs(ctx context.Context, client *entclient.Client, email string) ([]ent
 
 	orgs = userOrgs(user, orgs)
 
-	var allEnvs []entclient.Environment
+	var allEnvs []coder.Environment
 
 	for _, org := range orgs {
-		envs, err := client.EnvironmentsInOrganization(ctx, user, &org)
+		envs, err := client.EnvironmentsByOrganization(ctx, user.ID, org.ID)
 		if err != nil {
 			return nil, xerrors.Errorf("get envs for %v: %+v", org.Name, err)
 		}
@@ -58,7 +57,7 @@ func getEnvs(ctx context.Context, client *entclient.Client, email string) ([]ent
 }
 
 // findEnv returns a single environment by name (if it exists.)
-func findEnv(ctx context.Context, client *entclient.Client, envName, userEmail string) (*entclient.Environment, error) {
+func findEnv(ctx context.Context, client *coder.Client, envName, userEmail string) (*coder.Environment, error) {
 	envs, err := getEnvs(ctx, client, userEmail)
 	if err != nil {
 		return nil, xerrors.Errorf("get environments: %w", err)
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/config"
-	"cdr.dev/coder-cli/internal/entclient"
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
 )
@@ -85,19 +85,19 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
 			return nil
 		}
 
-		entClient := requireAuth()
+		client := requireAuth()
 
 		sshAvailable := isSSHAvailable(ctx)
 		if !sshAvailable {
 			return xerrors.New("SSH is disabled or not available for your Coder Enterprise deployment.")
 		}
 
-		user, err := entClient.Me(cmd.Context())
+		user, err := client.Me(cmd.Context())
 		if err != nil {
 			return xerrors.Errorf("fetch username: %w", err)
 		}
 
-		envs, err := getEnvs(cmd.Context(), entClient, entclient.Me)
+		envs, err := getEnvs(cmd.Context(), client, coder.Me)
 		if err != nil {
 			return err
 		}
@@ -122,7 +122,7 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
 		if err != nil {
 			return xerrors.Errorf("write new configurations to ssh config file %q: %w", *configpath, err)
 		}
-		err = writeSSHKey(ctx, entClient)
+		err = writeSSHKey(ctx, client)
 		if err != nil {
 			return xerrors.Errorf("fetch and write ssh key: %w", err)
 		}
@@ -139,15 +139,15 @@ var (
 	privateKeyFilepath = filepath.Join(os.Getenv("HOME"), ".ssh", "coder_enterprise")
 )
 
-func writeSSHKey(ctx context.Context, client *entclient.Client) error {
+func writeSSHKey(ctx context.Context, client *coder.Client) error {
 	key, err := client.SSHKey(ctx)
 	if err != nil {
 		return err
 	}
 	return ioutil.WriteFile(privateKeyFilepath, []byte(key.PrivateKey), 0400)
 }
 
-func makeNewConfigs(userName string, envs []entclient.Environment, startToken, startMsg, endToken string) (string, error) {
+func makeNewConfigs(userName string, envs []coder.Environment, startToken, startMsg, endToken string) (string, error) {
 	hostname, err := configuredHostname()
 	if err != nil {
 		return "", nil
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"os"
 
-	"cdr.dev/coder-cli/internal/entclient"
+	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/x/xtabwriter"
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
@@ -20,7 +20,7 @@ func makeEnvsCommand() *cobra.Command {
 		Short: "Interact with Coder environments",
 		Long:  "Perform operations on the Coder environments owned by the active user.",
 	}
-	cmd.PersistentFlags().StringVar(&user, "user", entclient.Me, "Specify the user whose resources to target")
+	cmd.PersistentFlags().StringVar(&user, "user", coder.Me, "Specify the user whose resources to target")
 
 	lsCmd := &cobra.Command{
 		Use:   "ls",
diff --git a/internal/cmd/secrets.go b/internal/cmd/secrets.go
diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
diff --git a/internal/cmd/sync.go b/internal/cmd/sync.go
diff --git a/internal/cmd/urls.go b/internal/cmd/urls.go
diff --git a/internal/sync/sync.go b/internal/sync/sync.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package entclient`
	`1`	`+package coder`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`