fixup! Export entclient to coder-sdk

cmoog · cmoog · commit a1a318fc5605 · 2020-08-15T11:15:45.000-05:00
diff --git a/coder-sdk/env.go b/coder-sdk/env.go
@@ -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/secrets.go b/coder-sdk/secrets.go
@@ -17,33 +17,33 @@ 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
 }
 
 // SecretWithValueByName gets the Coder secret with its value by its name.
-func (c *Client) SecretWithValueByName(ctx context.Context, name string, user *User) (*Secret, error) {
-	s, err := c.SecretByName(ctx, name, user)
+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/"+s.ID, nil, &secret)
+	err = c.requestBody(ctx, http.MethodGet, "/api/users/"+userID+"/secrets/"+s.ID, nil, &secret)
 	return &secret, err
 }
 
 // SecretWithValueByID gets the Coder secret with its value by the secret_id.
-func (c *Client) SecretWithValueByID(ctx context.Context, id string, user *User) (*Secret, error) {
+func (c *Client) SecretWithValueByID(ctx context.Context, id, userID string) (*Secret, error) {
 	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/"+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) {
-	secrets, err := c.Secrets(ctx, 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
 	}
@@ -69,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 {
-	secret, err := c.SecretByName(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/"+secret.ID, nil)
+	_, err = c.request(ctx, http.MethodDelete, "/api/users/"+userID+"/secrets/"+secret.ID, nil)
 	return err
 }
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -44,7 +44,7 @@ func getEnvs(ctx context.Context, client *coder.Client, email string) ([]coder.E
 	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)
 		}
diff --git a/internal/cmd/secrets.go b/internal/cmd/secrets.go
@@ -141,7 +141,7 @@ func listSecrets(userEmail *string) func(cmd *cobra.Command, _ []string) error {
 			return xerrors.Errorf("get user %q by email: %w", *userEmail, err)
 		}
 
-		secrets, err := client.Secrets(cmd.Context(), user)
+		secrets, err := client.Secrets(cmd.Context(), user.ID)
 		if err != nil {
 			return xerrors.Errorf("get secrets: %w", err)
 		}
@@ -174,7 +174,7 @@ func makeViewSecret(userEmail *string) func(cmd *cobra.Command, args []string) e
 			return xerrors.Errorf("get user %q by email: %w", *userEmail, err)
 		}
 
-		secret, err := client.SecretWithValueByName(cmd.Context(), name, user)
+		secret, err := client.SecretWithValueByName(cmd.Context(), name, user.ID)
 		if err != nil {
 			return xerrors.Errorf("get secret by name: %w", err)
 		}
@@ -199,7 +199,7 @@ func makeRemoveSecrets(userEmail *string) func(c *cobra.Command, args []string)
 
 		errorSeen := false
 		for _, n := range args {
-			err := client.DeleteSecretByName(cmd.Context(), n, user)
+			err := client.DeleteSecretByName(cmd.Context(), n, user.ID)
 			if err != nil {
 				flog.Error("failed to delete secret %q: %v", n, err)
 				errorSeen = true

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func getEnvs(ctx context.Context, client *coder.Client, email string) ([]coder.E`
`44`	`44`	`var allEnvs []coder.Environment`
`45`	`45`
`46`	`46`	`for _, org := range orgs {`
`47`		`- envs, err := client.EnvironmentsInOrganization(ctx, user, &org)`
	`47`	`+ envs, err := client.EnvironmentsByOrganization(ctx, user.ID, org.ID)`
`48`	`48`	`if err != nil {`
`49`	`49`	`return nil, xerrors.Errorf("get envs for %v: %+v", org.Name, err)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func listSecrets(userEmail string) func(cmd cobra.Command, _ []string) error {`
`141`	`141`	`return xerrors.Errorf("get user %q by email: %w", *userEmail, err)`
`142`	`142`	`}`
`143`	`143`
`144`		`- secrets, err := client.Secrets(cmd.Context(), user)`
	`144`	`+ secrets, err := client.Secrets(cmd.Context(), user.ID)`
`145`	`145`	`if err != nil {`
`146`	`146`	`return xerrors.Errorf("get secrets: %w", err)`
`147`	`147`	`}`
`@@ -174,7 +174,7 @@ func makeViewSecret(userEmail string) func(cmd cobra.Command, args []string) e`
`174`	`174`	`return xerrors.Errorf("get user %q by email: %w", *userEmail, err)`
`175`	`175`	`}`
`176`	`176`
`177`		`- secret, err := client.SecretWithValueByName(cmd.Context(), name, user)`
	`177`	`+ secret, err := client.SecretWithValueByName(cmd.Context(), name, user.ID)`
`178`	`178`	`if err != nil {`
`179`	`179`	`return xerrors.Errorf("get secret by name: %w", err)`
`180`	`180`	`}`
`@@ -199,7 +199,7 @@ func makeRemoveSecrets(userEmail string) func(c cobra.Command, args []string)`
`199`	`199`
`200`	`200`	`errorSeen := false`
`201`	`201`	`for _, n := range args {`
`202`		`- err := client.DeleteSecretByName(cmd.Context(), n, user)`
	`202`	`+ err := client.DeleteSecretByName(cmd.Context(), n, user.ID)`
`203`	`203`	`if err != nil {`
`204`	`204`	`flog.Error("failed to delete secret %q: %v", n, err)`
`205`	`205`	`errorSeen = true`