Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions pkg/cli/commands/organizations/common.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package organizations

import (
"fmt"
"io"
"time"

"github.com/superplanehq/superplane/pkg/openapi_client"
)

func renderOrganization(stdout io.Writer, org openapi_client.OrganizationsOrganization) error {
metadata := org.GetMetadata()

_, _ = fmt.Fprintf(stdout, "ID: %s\n", metadata.GetId())
_, _ = fmt.Fprintf(stdout, "Name: %s\n", metadata.GetName())
_, _ = fmt.Fprintf(stdout, "Description: %s\n", metadata.GetDescription())
_, _ = fmt.Fprintf(stdout, "Versioning Enabled: %t\n", metadata.GetVersioningEnabled())
if metadata.HasCreatedAt() {
_, _ = fmt.Fprintf(stdout, "Created At: %s\n", metadata.GetCreatedAt().Format(time.RFC3339))
}
if metadata.HasUpdatedAt() {
_, _ = fmt.Fprintf(stdout, "Updated At: %s\n", metadata.GetUpdatedAt().Format(time.RFC3339))
}

return nil
}
32 changes: 32 additions & 0 deletions pkg/cli/commands/organizations/get.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package organizations

import (
"io"

"github.com/superplanehq/superplane/pkg/cli/core"
)

type getCommand struct{}

func (c *getCommand) Execute(ctx core.CommandContext) error {
organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}

response, _, err := ctx.API.OrganizationAPI.
OrganizationsDescribeOrganization(ctx.Context, organizationID).
Execute()
if err != nil {
return err
}

if !ctx.Renderer.IsText() {
return ctx.Renderer.Render(response)
}

org := response.GetOrganization()
return ctx.Renderer.RenderText(func(stdout io.Writer) error {
return renderOrganization(stdout, org)
})
}
43 changes: 43 additions & 0 deletions pkg/cli/commands/organizations/root.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package organizations

import (
"github.com/spf13/cobra"
"github.com/superplanehq/superplane/pkg/cli/core"
)

func NewCommand(options core.BindOptions) *cobra.Command {
root := &cobra.Command{
Use: "organizations",
Short: "Manage organizations",
Aliases: []string{"org", "orgs"},
}

getCmd := &cobra.Command{
Use: "get",
Short: "Get details for the current organization",
Args: cobra.NoArgs,
}
core.Bind(getCmd, &getCommand{}, options)

var updateName string
var updateDescription string
var updateVersioningEnabled bool
updateCmd := &cobra.Command{
Use: "update",
Short: "Update the current organization",
Args: cobra.NoArgs,
}
updateCmd.Flags().StringVar(&updateName, "name", "", "organization name")
updateCmd.Flags().StringVar(&updateDescription, "description", "", "organization description")
updateCmd.Flags().BoolVar(&updateVersioningEnabled, "versioning-enabled", false, "enable or disable global versioning")
core.Bind(updateCmd, &updateCommand{
name: &updateName,
description: &updateDescription,
versioningEnabled: &updateVersioningEnabled,
}, options)

root.AddCommand(getCmd)
root.AddCommand(updateCmd)

return root
}
62 changes: 62 additions & 0 deletions pkg/cli/commands/organizations/update.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package organizations

import (
"fmt"
"io"

"github.com/superplanehq/superplane/pkg/cli/core"
"github.com/superplanehq/superplane/pkg/openapi_client"
)

type updateCommand struct {
name *string
description *string
versioningEnabled *bool
}

func (c *updateCommand) Execute(ctx core.CommandContext) error {
if !ctx.Cmd.Flags().Changed("name") &&
!ctx.Cmd.Flags().Changed("description") &&
!ctx.Cmd.Flags().Changed("versioning-enabled") {
return fmt.Errorf("at least one flag must be provided: --name, --description, or --versioning-enabled")
}

organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}

metadata := openapi_client.OrganizationsOrganizationMetadata{}
if ctx.Cmd.Flags().Changed("name") {
metadata.SetName(*c.name)
}
if ctx.Cmd.Flags().Changed("description") {
metadata.SetDescription(*c.description)
}
if ctx.Cmd.Flags().Changed("versioning-enabled") {
metadata.SetVersioningEnabled(*c.versioningEnabled)
}

org := openapi_client.OrganizationsOrganization{}
org.SetMetadata(metadata)

body := openapi_client.OrganizationsUpdateOrganizationBody{}
body.SetOrganization(org)

response, _, err := ctx.API.OrganizationAPI.
OrganizationsUpdateOrganization(ctx.Context, organizationID).
Body(body).
Execute()
if err != nil {
return err
}

if !ctx.Renderer.IsText() {
return ctx.Renderer.Render(response)
}

updated := response.GetOrganization()
return ctx.Renderer.RenderText(func(stdout io.Writer) error {
return renderOrganization(stdout, updated)
})
}
14 changes: 0 additions & 14 deletions pkg/cli/commands/secrets/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"io"
"os"
"sort"
"strings"
"text/tabwriter"
"time"

Expand All @@ -25,19 +24,6 @@ type secretResource struct {
Spec *openapi_client.SecretsSecretSpec `json:"spec,omitempty"`
}

func resolveOrganizationID(ctx core.CommandContext) (string, error) {
me, _, err := ctx.API.MeAPI.MeMe(ctx.Context).Execute()
if err != nil {
return "", err
}

if !me.HasOrganizationId() || strings.TrimSpace(me.GetOrganizationId()) == "" {
return "", fmt.Errorf("organization id not found for authenticated user")
}

return me.GetOrganizationId(), nil
}

func organizationDomainType() openapi_client.AuthorizationDomainType {
return openapi_client.AUTHORIZATIONDOMAINTYPE_DOMAIN_TYPE_ORGANIZATION
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/commands/secrets/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func (c *createCommand) Execute(ctx core.CommandContext) error {
return fmt.Errorf("--file is required")
}

organizationID, err := resolveOrganizationID(ctx)
organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/commands/secrets/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
type deleteCommand struct{}

func (c *deleteCommand) Execute(ctx core.CommandContext) error {
organizationID, err := resolveOrganizationID(ctx)
organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/commands/secrets/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
type getCommand struct{}

func (c *getCommand) Execute(ctx core.CommandContext) error {
organizationID, err := resolveOrganizationID(ctx)
organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/commands/secrets/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
type listCommand struct{}

func (c *listCommand) Execute(ctx core.CommandContext) error {
organizationID, err := resolveOrganizationID(ctx)
organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/commands/secrets/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func (c *updateCommand) Execute(ctx core.CommandContext) error {
return fmt.Errorf("update does not accept positional arguments")
}

organizationID, err := resolveOrganizationID(ctx)
organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}
Expand Down
15 changes: 1 addition & 14 deletions pkg/cli/commands/usage/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const unlimitedValue = "-1"
type getCommand struct{}

func (c *getCommand) Execute(ctx core.CommandContext) error {
organizationID, err := resolveOrganizationID(ctx)
organizationID, err := core.ResolveOrganizationID(ctx)
if err != nil {
return err
}
Expand All @@ -39,19 +39,6 @@ func (c *getCommand) Execute(ctx core.CommandContext) error {
})
}

func resolveOrganizationID(ctx core.CommandContext) (string, error) {
me, _, err := ctx.API.MeAPI.MeMe(ctx.Context).Execute()
if err != nil {
return "", err
}

if !me.HasOrganizationId() || strings.TrimSpace(me.GetOrganizationId()) == "" {
return "", fmt.Errorf("organization id not found for authenticated user")
}

return me.GetOrganizationId(), nil
}

func renderUsageText(stdout io.Writer, response *openapi_client.OrganizationsDescribeUsageResponse) error {
if response == nil {
return fmt.Errorf("usage response was empty")
Expand Down
13 changes: 13 additions & 0 deletions pkg/cli/core/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,19 @@ func FindIntegrationDefinition(ctx CommandContext, name string) (openapi_client.
return openapi_client.IntegrationsIntegrationDefinition{}, fmt.Errorf("integration %q not found", name)
}

func ResolveOrganizationID(ctx CommandContext) (string, error) {
me, _, err := ctx.API.MeAPI.MeMe(ctx.Context).Execute()
if err != nil {
return "", err
}

if !me.HasOrganizationId() || strings.TrimSpace(me.GetOrganizationId()) == "" {
return "", fmt.Errorf("organization id not found for authenticated user")
}

return me.GetOrganizationId(), nil
}

func ResolveCanvasID(ctx CommandContext, canvasID string) (string, error) {
canvasID = strings.TrimSpace(canvasID)
if canvasID != "" {
Expand Down
2 changes: 2 additions & 0 deletions pkg/cli/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
executions "github.com/superplanehq/superplane/pkg/cli/commands/executions"
index "github.com/superplanehq/superplane/pkg/cli/commands/index"
integrations "github.com/superplanehq/superplane/pkg/cli/commands/integrations"
organizations "github.com/superplanehq/superplane/pkg/cli/commands/organizations"
queue "github.com/superplanehq/superplane/pkg/cli/commands/queue"
secrets "github.com/superplanehq/superplane/pkg/cli/commands/secrets"
usage "github.com/superplanehq/superplane/pkg/cli/commands/usage"
Expand Down Expand Up @@ -57,6 +58,7 @@ func init() {
RootCmd.AddCommand(events.NewCommand(options))
RootCmd.AddCommand(index.NewCommand(options))
RootCmd.AddCommand(integrations.NewCommand(options))
RootCmd.AddCommand(organizations.NewCommand(options))
RootCmd.AddCommand(queue.NewCommand(options))
RootCmd.AddCommand(secrets.NewCommand(options))
RootCmd.AddCommand(usage.NewCommand(options))
Expand Down
Loading