Add organizations

cmd/garm-cli/client/client.go

@@ -120,172 +120,10 @@ func (c *Client) ListProviders() ([]params.Provider, error) {
 	return providers, nil
 }
 
-func (c *Client) ListRepositories() ([]params.Repository, error) {
-	var repos []params.Repository
-	url := fmt.Sprintf("%s/api/v1/repositories", c.Config.BaseURL)
-	resp, err := c.client.R().
-		SetResult(&repos).
-		Get(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return nil, errors.Wrap(decErr, "sending request")
-		}
-		return nil, fmt.Errorf("error fetching repos: %s", apiErr.Details)
-	}
-	return repos, nil
-}
+func (c *Client) GetInstanceByName(instanceName string) (params.Instance, error) {
+	url := fmt.Sprintf("%s/api/v1/instances/%s", c.Config.BaseURL, instanceName)
 
-func (c *Client) CreateRepository(param params.CreateRepoParams) (params.Repository, error) {
-	var response params.Repository
-	url := fmt.Sprintf("%s/api/v1/repositories", c.Config.BaseURL)
-
-	body, err := json.Marshal(param)
-	if err != nil {
-		return params.Repository{}, err
-	}
-	resp, err := c.client.R().
-		SetBody(body).
-		SetResult(&response).
-		Post(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return response, errors.Wrap(decErr, "sending request")
-		}
-		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
-	}
-	return response, nil
-}
-
-func (c *Client) GetRepository(repoID string) (params.Repository, error) {
-	var response params.Repository
-	url := fmt.Sprintf("%s/api/v1/repositories/%s", c.Config.BaseURL, repoID)
-	resp, err := c.client.R().
-		SetResult(&response).
-		Get(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return response, errors.Wrap(decErr, "sending request")
-		}
-		return response, fmt.Errorf("error fetching repos: %s", apiErr.Details)
-	}
-	return response, nil
-}
-
-func (c *Client) DeleteRepository(repoID string) error {
-	url := fmt.Sprintf("%s/api/v1/repositories/%s", c.Config.BaseURL, repoID)
-	resp, err := c.client.R().
-		Delete(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return errors.Wrap(decErr, "sending request")
-		}
-		return fmt.Errorf("error fetching repos: %s", apiErr.Details)
-	}
-	return nil
-}
-
-func (c *Client) CreateRepoPool(repoID string, param params.CreatePoolParams) (params.Pool, error) {
-	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools", c.Config.BaseURL, repoID)
-
-	var response params.Pool
-	body, err := json.Marshal(param)
-	if err != nil {
-		return response, err
-	}
-	resp, err := c.client.R().
-		SetBody(body).
-		SetResult(&response).
-		Post(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return response, errors.Wrap(decErr, "sending request")
-		}
-		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
-	}
-	return response, nil
-}
-
-func (c *Client) ListRepoPools(repoID string) ([]params.Pool, error) {
-	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools", c.Config.BaseURL, repoID)
-
-	var response []params.Pool
-	resp, err := c.client.R().
-		SetResult(&response).
-		Get(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return response, errors.Wrap(decErr, "sending request")
-		}
-		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
-	}
-	return response, nil
-}
-
-func (c *Client) GetRepoPool(repoID, poolID string) (params.Pool, error) {
-	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools/%s", c.Config.BaseURL, repoID, poolID)
-
-	var response params.Pool
-	resp, err := c.client.R().
-		SetResult(&response).
-		Get(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return response, errors.Wrap(decErr, "sending request")
-		}
-		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
-	}
-	return response, nil
-}
-
-func (c *Client) DeleteRepoPool(repoID, poolID string) error {
-	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools/%s", c.Config.BaseURL, repoID, poolID)
-
-	resp, err := c.client.R().
-		Delete(url)
-
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return errors.Wrap(decErr, "sending request")
-		}
-		return fmt.Errorf("error performing login: %s", apiErr.Details)
-	}
-	return nil
-}
-
-func (c *Client) UpdateRepoPool(repoID, poolID string, param params.UpdatePoolParams) (params.Pool, error) {
-	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools/%s", c.Config.BaseURL, repoID, poolID)
-
-	var response params.Pool
-	body, err := json.Marshal(param)
-	if err != nil {
-		return response, err
-	}
-	resp, err := c.client.R().
-		SetBody(body).
-		SetResult(&response).
-		Put(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return response, errors.Wrap(decErr, "sending request")
-		}
-		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
-	}
-	return response, nil
-}
-
-func (c *Client) ListRepoInstances(repoID string) ([]params.Instance, error) {
-	url := fmt.Sprintf("%s/api/v1/repositories/%s/instances", c.Config.BaseURL, repoID)
-
-	var response []params.Instance
+	var response params.Instance
 	resp, err := c.client.R().
 		SetResult(&response).
 		Get(url)
@@ -315,20 +153,3 @@ func (c *Client) ListPoolInstances(poolID string) ([]params.Instance, error) {
 	}
 	return response, nil
 }
-
-func (c *Client) GetInstanceByName(instanceName string) (params.Instance, error) {
-	url := fmt.Sprintf("%s/api/v1/instances/%s", c.Config.BaseURL, instanceName)
-
-	var response params.Instance
-	resp, err := c.client.R().
-		SetResult(&response).
-		Get(url)
-	if err != nil || resp.IsError() {
-		apiErr, decErr := c.decodeAPIError(resp.Body())
-		if decErr != nil {
-			return response, errors.Wrap(decErr, "sending request")
-		}
-		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
-	}
-	return response, nil
-}

cmd/garm-cli/client/organizations.go

@@ -0,0 +1,189 @@
+package client
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"garm/params"
+
+	"github.com/pkg/errors"
+)
+
+func (c *Client) ListOrganizations() ([]params.Organization, error) {
+	var orgs []params.Organization
+	url := fmt.Sprintf("%s/api/v1/organizations", c.Config.BaseURL)
+	resp, err := c.client.R().
+		SetResult(&orgs).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return nil, errors.Wrap(decErr, "sending request")
+		}
+		return nil, fmt.Errorf("error fetching orgs: %s", apiErr.Details)
+	}
+	return orgs, nil
+}
+
+func (c *Client) CreateOrganization(param params.CreateOrgParams) (params.Organization, error) {
+	var response params.Organization
+	url := fmt.Sprintf("%s/api/v1/organizations", c.Config.BaseURL)
+
+	body, err := json.Marshal(param)
+	if err != nil {
+		return params.Organization{}, err
+	}
+	resp, err := c.client.R().
+		SetBody(body).
+		SetResult(&response).
+		Post(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) GetOrganization(orgID string) (params.Organization, error) {
+	var response params.Organization
+	url := fmt.Sprintf("%s/api/v1/organizations/%s", c.Config.BaseURL, orgID)
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error fetching orgs: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) DeleteOrganization(orgID string) error {
+	url := fmt.Sprintf("%s/api/v1/organizations/%s", c.Config.BaseURL, orgID)
+	resp, err := c.client.R().
+		Delete(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return errors.Wrap(decErr, "sending request")
+		}
+		return fmt.Errorf("error fetching orgs: %s", apiErr.Details)
+	}
+	return nil
+}
+
+func (c *Client) CreateOrgPool(orgID string, param params.CreatePoolParams) (params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/organizations/%s/pools", c.Config.BaseURL, orgID)
+
+	var response params.Pool
+	body, err := json.Marshal(param)
+	if err != nil {
+		return response, err
+	}
+	resp, err := c.client.R().
+		SetBody(body).
+		SetResult(&response).
+		Post(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error creating org pool: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) ListOrgPools(orgID string) ([]params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/organizations/%s/pools", c.Config.BaseURL, orgID)
+
+	var response []params.Pool
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error listing org pools: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) GetOrgPool(orgID, poolID string) (params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/organizations/%s/pools/%s", c.Config.BaseURL, orgID, poolID)
+
+	var response params.Pool
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error fetching org pool: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) DeleteOrgPool(orgID, poolID string) error {
+	url := fmt.Sprintf("%s/api/v1/organizations/%s/pools/%s", c.Config.BaseURL, orgID, poolID)
+
+	resp, err := c.client.R().
+		Delete(url)
+
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return errors.Wrap(decErr, "sending request")
+		}
+		return fmt.Errorf("error deleting org pool: %s", apiErr.Details)
+	}
+	return nil
+}
+
+func (c *Client) UpdateOrgPool(orgID, poolID string, param params.UpdatePoolParams) (params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/organizations/%s/pools/%s", c.Config.BaseURL, orgID, poolID)
+
+	var response params.Pool
+	body, err := json.Marshal(param)
+	if err != nil {
+		return response, err
+	}
+	resp, err := c.client.R().
+		SetBody(body).
+		SetResult(&response).
+		Put(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error updating org pool: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) ListOrgInstances(orgID string) ([]params.Instance, error) {
+	url := fmt.Sprintf("%s/api/v1/organizations/%s/instances", c.Config.BaseURL, orgID)
+
+	var response []params.Instance
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error listing org instances: %s", apiErr.Details)
+	}
+	return response, nil
+}

cmd/garm-cli/client/repositories.go

@@ -0,0 +1,189 @@
+package client
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"garm/params"
+
+	"github.com/pkg/errors"
+)
+
+func (c *Client) ListRepositories() ([]params.Repository, error) {
+	var repos []params.Repository
+	url := fmt.Sprintf("%s/api/v1/repositories", c.Config.BaseURL)
+	resp, err := c.client.R().
+		SetResult(&repos).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return nil, errors.Wrap(decErr, "sending request")
+		}
+		return nil, fmt.Errorf("error fetching repos: %s", apiErr.Details)
+	}
+	return repos, nil
+}
+
+func (c *Client) CreateRepository(param params.CreateRepoParams) (params.Repository, error) {
+	var response params.Repository
+	url := fmt.Sprintf("%s/api/v1/repositories", c.Config.BaseURL)
+
+	body, err := json.Marshal(param)
+	if err != nil {
+		return params.Repository{}, err
+	}
+	resp, err := c.client.R().
+		SetBody(body).
+		SetResult(&response).
+		Post(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) GetRepository(repoID string) (params.Repository, error) {
+	var response params.Repository
+	url := fmt.Sprintf("%s/api/v1/repositories/%s", c.Config.BaseURL, repoID)
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error fetching repos: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) DeleteRepository(repoID string) error {
+	url := fmt.Sprintf("%s/api/v1/repositories/%s", c.Config.BaseURL, repoID)
+	resp, err := c.client.R().
+		Delete(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return errors.Wrap(decErr, "sending request")
+		}
+		return fmt.Errorf("error fetching repos: %s", apiErr.Details)
+	}
+	return nil
+}
+
+func (c *Client) CreateRepoPool(repoID string, param params.CreatePoolParams) (params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools", c.Config.BaseURL, repoID)
+
+	var response params.Pool
+	body, err := json.Marshal(param)
+	if err != nil {
+		return response, err
+	}
+	resp, err := c.client.R().
+		SetBody(body).
+		SetResult(&response).
+		Post(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) ListRepoPools(repoID string) ([]params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools", c.Config.BaseURL, repoID)
+
+	var response []params.Pool
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) GetRepoPool(repoID, poolID string) (params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools/%s", c.Config.BaseURL, repoID, poolID)
+
+	var response params.Pool
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) DeleteRepoPool(repoID, poolID string) error {
+	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools/%s", c.Config.BaseURL, repoID, poolID)
+
+	resp, err := c.client.R().
+		Delete(url)
+
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return errors.Wrap(decErr, "sending request")
+		}
+		return fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return nil
+}
+
+func (c *Client) UpdateRepoPool(repoID, poolID string, param params.UpdatePoolParams) (params.Pool, error) {
+	url := fmt.Sprintf("%s/api/v1/repositories/%s/pools/%s", c.Config.BaseURL, repoID, poolID)
+
+	var response params.Pool
+	body, err := json.Marshal(param)
+	if err != nil {
+		return response, err
+	}
+	resp, err := c.client.R().
+		SetBody(body).
+		SetResult(&response).
+		Put(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return response, nil
+}
+
+func (c *Client) ListRepoInstances(repoID string) ([]params.Instance, error) {
+	url := fmt.Sprintf("%s/api/v1/repositories/%s/instances", c.Config.BaseURL, repoID)
+
+	var response []params.Instance
+	resp, err := c.client.R().
+		SetResult(&response).
+		Get(url)
+	if err != nil || resp.IsError() {
+		apiErr, decErr := c.decodeAPIError(resp.Body())
+		if decErr != nil {
+			return response, errors.Wrap(decErr, "sending request")
+		}
+		return response, fmt.Errorf("error performing login: %s", apiErr.Details)
+	}
+	return response, nil
+}