organizations: provide create/delete endpoint

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v1.0.50]
+- **ADDED**
+  - Add organization create/delete
+   ([PR #51](https://github.com/cycloidio/cycloid-cli/pull/51))
+
 ## [v1.0.49]
 - **ADDED**
   - Add validate-form command

cmd/cycloid/middleware/middleware.go

@@ -50,6 +50,8 @@ type Middleware interface {
 	ListMembers(org string) ([]*models.MemberOrg, error)
 	UpdateMembers(org string, name string, roleID uint32) (*models.MemberOrg, error)
 
+	CreateOrganization(name string, canonical string) (*models.Organization, error)
+	DeleteOrganization(org string) error
 	GetOrganization(org string) (*models.Organization, error)
 	ListOrganizations() ([]*models.Organization, error)
 	ListOrganizationWorkers(org string) ([]*models.Worker, error)

cmd/cycloid/middleware/organization.go

@@ -1,12 +1,48 @@
 package middleware
 
 import (
+	strfmt "github.com/go-openapi/strfmt"
+	"github.com/pkg/errors"
+	"regexp"
+
 	"github.com/cycloidio/cycloid-cli/client/client/organization_workers"
 	"github.com/cycloidio/cycloid-cli/client/client/organizations"
 	"github.com/cycloidio/cycloid-cli/client/models"
 	"github.com/cycloidio/cycloid-cli/cmd/cycloid/common"
 )
 
+func (m *middleware) CreateOrganization(name string, canonical string) (*models.Organization, error) {
+
+	params := organizations.NewCreateOrgParams()
+
+	if canonical == "" {
+		re := regexp.MustCompile(`[^a-zA-z0-9_\-]`)
+		canonical = re.ReplaceAllString(name, "-")
+	}
+
+	body := &models.NewOrganization{
+		Name:      &name,
+		Canonical: &canonical,
+	}
+
+	params.SetBody(body)
+	err := body.Validate(strfmt.Default)
+	if err != nil {
+		return nil, errors.Wrap(err, "unable to validate request body")
+	}
+
+	resp, err := m.api.Organizations.CreateOrg(params, common.ClientCredentials(nil))
+
+	if err != nil {
+		return nil, err
+	}
+
+	p := resp.GetPayload()
+
+	d := p.Data
+	return d, err
+}
+
 func (m *middleware) GetOrganization(org string) (*models.Organization, error) {
 
 	params := organizations.NewGetOrgParams()
@@ -70,3 +106,11 @@ func (m *middleware) ListOrganizations() ([]*models.Organization, error) {
 	d := p.Data
 	return d, err
 }
+
+func (m *middleware) DeleteOrganization(org string) error {
+	params := organizations.NewDeleteOrgParams()
+	params.SetOrganizationCanonical(org)
+
+	_, err := m.api.Organizations.DeleteOrg(params, common.ClientCredentials(&org))
+	return err
+}

cmd/cycloid/organizations/cmd.go

@@ -6,7 +6,7 @@ import (
 
 func NewCommands() *cobra.Command {
 	var cmd = &cobra.Command{
-		Use:   "organization",
+		Use: "organization",
 		Aliases: []string{
 			"org",
 			"organizations",
@@ -15,8 +15,10 @@ func NewCommands() *cobra.Command {
 		Short: "Manage the organizations",
 	}
 	cmd.AddCommand(
+		NewCreateCommand(),
 		NewListCommand(),
 		NewListWorkersCommand(),
+		NewDeleteCommand(),
 		NewGetCommand())
 	return cmd
 }

cmd/cycloid/organizations/common.go

@@ -0,0 +1,20 @@
+package organizations
+
+import "github.com/spf13/cobra"
+
+var (
+	nameFlag      string
+	canonicalFlag string
+)
+
+func WithFlagName(cmd *cobra.Command) string {
+	flagName := "name"
+	cmd.Flags().StringVar(&nameFlag, flagName, "", "name")
+	return flagName
+}
+
+func WithPersistentFlagCanonical(cmd *cobra.Command) string {
+	flagName := "canonical"
+	cmd.PersistentFlags().StringVar(&canonicalFlag, flagName, "", "Canonical")
+	return flagName
+}

cmd/cycloid/organizations/create.go

@@ -0,0 +1,69 @@
+package organizations
+
+import (
+	"os"
+
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+
+	"github.com/cycloidio/cycloid-cli/cmd/cycloid/common"
+	"github.com/cycloidio/cycloid-cli/cmd/cycloid/internal"
+	"github.com/cycloidio/cycloid-cli/cmd/cycloid/middleware"
+	"github.com/cycloidio/cycloid-cli/printer"
+	"github.com/cycloidio/cycloid-cli/printer/factory"
+)
+
+func NewCreateCommand() *cobra.Command {
+	var cmd = &cobra.Command{
+		Use:   "create",
+		Short: "create an organization",
+		Example: `
+	# create an organization foo
+	cy organization create --name foo
+`,
+		RunE:    create,
+		PreRunE: internal.CheckAPIAndCLIVersion,
+	}
+
+	common.RequiredFlag(WithFlagName, cmd)
+	WithPersistentFlagCanonical(cmd)
+
+	return cmd
+}
+
+func create(cmd *cobra.Command, args []string) error {
+	api := common.NewAPI()
+	m := middleware.NewMiddleware(api)
+
+	name, err := cmd.Flags().GetString("name")
+	if err != nil {
+		return err
+	}
+	canonical, err := cmd.Flags().GetString("canonical")
+	if err != nil {
+		return err
+	}
+
+	output, err := cmd.Flags().GetString("output")
+	if err != nil {
+		return errors.Wrap(err, "unable to get output flag")
+	}
+
+	o, err := m.CreateOrganization(name, canonical)
+	if err != nil {
+		return errors.Wrap(err, "unable to create organization")
+	}
+
+	// fetch the printer from the factory
+	p, err := factory.GetPrinter(output)
+	if err != nil {
+		return errors.Wrap(err, "unable to get printer")
+	}
+
+	// print the result on the standard output
+	if err := p.Print(o, printer.Options{}, os.Stdout); err != nil {
+		return errors.Wrap(err, "unable to print result")
+	}
+
+	return nil
+}

cmd/cycloid/organizations/delete.go

@@ -0,0 +1,42 @@
+package organizations
+
+import (
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+
+	"github.com/cycloidio/cycloid-cli/cmd/cycloid/common"
+	"github.com/cycloidio/cycloid-cli/cmd/cycloid/internal"
+	"github.com/cycloidio/cycloid-cli/cmd/cycloid/middleware"
+)
+
+func NewDeleteCommand() *cobra.Command {
+	var cmd = &cobra.Command{
+		Use:   "delete",
+		Short: "delete an organization",
+		Example: `
+	# delete an organization with canonical name my-org
+	cy organization delete --org my-org
+`,
+		RunE:    del,
+		PreRunE: internal.CheckAPIAndCLIVersion,
+	}
+
+	common.RequiredPersistentFlag(common.WithFlagOrg, cmd)
+
+	return cmd
+}
+
+func del(cmd *cobra.Command, args []string) error {
+	api := common.NewAPI()
+	m := middleware.NewMiddleware(api)
+
+	org, err := cmd.Flags().GetString("org")
+	if err != nil {
+		return errors.Wrap(err, "unable get org flag")
+	}
+
+	if err := m.DeleteOrganization(org); err != nil {
+		return errors.Wrap(err, "unable to delete organization")
+	}
+	return nil
+}

cmd/cycloid/organizations/get.go

@@ -6,7 +6,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/cycloidio/cycloid-cli/client/client/organizations"
 	"github.com/cycloidio/cycloid-cli/cmd/cycloid/common"
 	"github.com/cycloidio/cycloid-cli/cmd/cycloid/internal"
 	"github.com/cycloidio/cycloid-cli/cmd/cycloid/middleware"
@@ -20,7 +19,7 @@ func NewGetCommand() *cobra.Command {
 		Short: "get an organization",
 		Example: `
 	# get an organization by its canonical
-	cy organization --org my-org -o yaml
+	cy organization get --org my-org -o yaml
 `,
 		RunE:    get,
 		PreRunE: internal.CheckAPIAndCLIVersion,
@@ -43,9 +42,6 @@ func get(cmd *cobra.Command, args []string) error {
 		return errors.Wrap(err, "unable to get output flag")
 	}
 
-	params := organizations.NewGetOrgParams()
-	params.SetOrganizationCanonical(org)
-
 	o, err := m.GetOrganization(org)
 	if err != nil {
 		return errors.Wrap(err, "unable to get organization")