-
-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add describe/update command, adapt create (#1060)
Co-authored-by: David Ragot <[email protected]>
- Loading branch information
Showing
19 changed files
with
1,017 additions
and
358 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package organizations | ||
|
|
||
| import ( | ||
| "github.com/formancehq/fctl/cmd/cloud/organizations/internal" | ||
| "github.com/formancehq/fctl/membershipclient" | ||
| fctl "github.com/formancehq/fctl/pkg" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| type DescribeStore struct { | ||
| Organization *membershipclient.Organization `json:"organization"` | ||
| } | ||
| type DescribeController struct { | ||
| store *DescribeStore | ||
| } | ||
|
|
||
| var _ fctl.Controller[*DescribeStore] = (*DescribeController)(nil) | ||
|
|
||
| func NewDefaultDescribeStore() *DescribeStore { | ||
| return &DescribeStore{} | ||
| } | ||
|
|
||
| func NewDescribeController() *DescribeController { | ||
| return &DescribeController{ | ||
| store: NewDefaultDescribeStore(), | ||
| } | ||
| } | ||
|
|
||
| func NewDescribeCommand() *cobra.Command { | ||
| return fctl.NewCommand("describe <organizationId>", | ||
| fctl.WithShortDescription("Describe organization"), | ||
| fctl.WithArgs(cobra.ExactArgs(1)), | ||
| fctl.WithConfirmFlag(), | ||
| fctl.WithController[*DescribeStore](NewDescribeController()), | ||
| ) | ||
| } | ||
|
|
||
| func (c *DescribeController) GetStore() *DescribeStore { | ||
| return c.store | ||
| } | ||
|
|
||
| func (c *DescribeController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) { | ||
|
|
||
| cfg, err := fctl.GetConfig(cmd) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| apiClient, err := fctl.NewMembershipClient(cmd, cfg) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| response, _, err := apiClient.DefaultApi. | ||
| ReadOrganization(cmd.Context(), args[0]).Execute() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| c.store.Organization = response.Data | ||
|
|
||
| return c, nil | ||
| } | ||
|
|
||
| func (c *DescribeController) Render(cmd *cobra.Command, args []string) error { | ||
| return internal.PrintOrganization(c.store.Organization) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package internal | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/formancehq/fctl/membershipclient" | ||
| "github.com/pterm/pterm" | ||
| ) | ||
|
|
||
| func PrintOrganization(organization *membershipclient.Organization) error { | ||
| pterm.DefaultSection.Println("Organization") | ||
|
|
||
| data := pterm.TableData{ | ||
| {"ID", organization.Id}, | ||
| {"Name", organization.Name}, | ||
| {"Default Stack Role", func() string { | ||
| if len(organization.DefaultStackAccess) == 0 { | ||
| return "None" | ||
| } | ||
| return strings.Join(organization.DefaultStackAccess, ", ") | ||
| }()}, | ||
| {"Default Organization Role", func() string { | ||
| if len(organization.DefaultOrganizationAccess) == 0 { | ||
| return "None" | ||
| } | ||
| return strings.Join(organization.DefaultOrganizationAccess, ", ") | ||
| }()}, | ||
| } | ||
|
|
||
| return pterm.DefaultTable.WithHasHeader().WithData(data).Render() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package organizations | ||
|
|
||
| import ( | ||
| "github.com/formancehq/fctl/cmd/cloud/organizations/internal" | ||
| "github.com/formancehq/fctl/membershipclient" | ||
| fctl "github.com/formancehq/fctl/pkg" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| type UpdateStore struct { | ||
| Organization *membershipclient.Organization `json:"organization"` | ||
| } | ||
| type UpdateController struct { | ||
| store *UpdateStore | ||
| } | ||
|
|
||
| var _ fctl.Controller[*UpdateStore] = (*UpdateController)(nil) | ||
|
|
||
| func NewDefaultUpdateStore() *UpdateStore { | ||
| return &UpdateStore{} | ||
| } | ||
|
|
||
| func NewUpdateController() *UpdateController { | ||
| return &UpdateController{ | ||
| store: NewDefaultUpdateStore(), | ||
| } | ||
| } | ||
|
|
||
| func NewUpdateCommand() *cobra.Command { | ||
| return fctl.NewCommand("update <organizationId> --name <name> --default-stack-role <defaultStackRole...> --default-organization-role <defaultOrganizationRole...>", | ||
| fctl.WithAliases("update"), | ||
| fctl.WithShortDescription("Update organization"), | ||
| fctl.WithArgs(cobra.ExactArgs(1)), | ||
| fctl.WithConfirmFlag(), | ||
| fctl.WithStringFlag("name", "", "Organization Name"), | ||
| fctl.WithStringSliceFlag("default-stack-role", []string{}, "Default Stack Role"), | ||
| fctl.WithStringSliceFlag("default-organization-role", []string{}, "Default Organization Role"), | ||
| fctl.WithController[*UpdateStore](NewUpdateController()), | ||
| ) | ||
| } | ||
|
|
||
| func (c *UpdateController) GetStore() *UpdateStore { | ||
| return c.store | ||
| } | ||
|
|
||
| func (c *UpdateController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) { | ||
|
|
||
| cfg, err := fctl.GetConfig(cmd) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| apiClient, err := fctl.NewMembershipClient(cmd, cfg) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if !fctl.CheckOrganizationApprobation(cmd, "You are about to update an organization") { | ||
| return nil, fctl.ErrMissingApproval | ||
| } | ||
|
|
||
| org, _, err := apiClient.DefaultApi.ReadOrganization(cmd.Context(), args[0]).Execute() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| preparedData := membershipclient.OrganizationData{ | ||
| Name: func() string { | ||
| if cmd.Flags().Changed("name") { | ||
| return cmd.Flag("name").Value.String() | ||
| } | ||
| return org.Data.Name | ||
| }(), | ||
| DefaultOrganizationAccess: func() []string { | ||
| if cmd.Flags().Changed("default-organization-role") { | ||
| return fctl.GetStringSlice(cmd, "default-organization-role") | ||
| } | ||
| return org.Data.DefaultOrganizationAccess | ||
| }(), | ||
| DefaultStackAccess: func() []string { | ||
| if cmd.Flags().Changed("default-stack-role") { | ||
| return fctl.GetStringSlice(cmd, "default-stack-role") | ||
| } | ||
| return org.Data.DefaultStackAccess | ||
| }(), | ||
| } | ||
|
|
||
| response, _, err := apiClient.DefaultApi. | ||
| UpdateOrganization(cmd.Context(), args[0]).OrganizationData(preparedData).Execute() | ||
|
|
||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| c.store.Organization = response.Data | ||
|
|
||
| return c, nil | ||
| } | ||
|
|
||
| func (c *UpdateController) Render(cmd *cobra.Command, args []string) error { | ||
| return internal.PrintOrganization(c.store.Organization) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.