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
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ generate: deps
mockgen --destination ./internal/mocks/account_service.go --package=mocks --source ./vendor/github.com/serverscom/serverscom-go-client/pkg/accounts.go
mockgen --destination ./internal/mocks/locations_service.go --package=mocks --source ./vendor/github.com/serverscom/serverscom-go-client/pkg/locations.go
mockgen --destination ./internal/mocks/kubernetes_clusters_service.go --package=mocks --source ./vendor/github.com/serverscom/serverscom-go-client/pkg/kubernetes_clusters.go
mockgen --destination ./internal/mocks/l2_segment_service.go --package=mocks --source ./vendor/github.com/serverscom/serverscom-go-client/pkg/l2_segments.go
sed -i '' 's|github.com/serverscom/srvctl/vendor/github.com/serverscom/serverscom-go-client/pkg|github.com/serverscom/serverscom-go-client/pkg|g' \
./internal/mocks/ssh_service.go \
./internal/mocks/hosts_service.go \
Expand All @@ -27,5 +28,5 @@ generate: deps
./internal/mocks/account_service.go \
./internal/mocks/collection.go \
./internal/mocks/locations_service.go \
./internal/mocks/kubernetes_clusters_service.go

./internal/mocks/kubernetes_clusters_service.go \
./internal/mocks/l2_segment_service.go
15 changes: 15 additions & 0 deletions cmd/base/list_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -401,3 +401,18 @@ func (o *SBMFlavorsShowAllOption[T]) ApplyToCollection(collection serverscom.Col
collection.SetParam("show_all", "true")
}
}

type L2SegmentGroupTypeOption[T any] struct {
group string
}

func (o *L2SegmentGroupTypeOption[T]) AddFlags(cmd *cobra.Command) {
cmd.Flags().StringVar(&o.group, "group-type", "",
"Filter l2 location groups by type (public, private)")
}

func (o *L2SegmentGroupTypeOption[T]) ApplyToCollection(collection serverscom.Collection[T]) {
if o.group != "" {
collection.SetParam("group_type", o.group)
}
}
6 changes: 6 additions & 0 deletions cmd/entities/hosts/hosts.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,5 +164,11 @@ func getHostsEntities() (map[string]entities.EntityInterface, error) {
}
result["sbm"] = sbmEntity

hostNetworkEntity, err := entities.Registry.GetEntityFromValue(serverscom.Network{})
if err != nil {
return nil, err
}
result["list-networks"] = hostNetworkEntity

return result, nil
}
52 changes: 52 additions & 0 deletions cmd/entities/l2_segments/add.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package l2segments

import (
"log"

serverscom "github.com/serverscom/serverscom-go-client/pkg"
"github.com/serverscom/srvctl/cmd/base"
"github.com/spf13/cobra"
)

func newAddCmd(cmdContext *base.CmdContext) *cobra.Command {
var path string

cmd := &cobra.Command{
Use: "add --input <path>",
Short: "Add a new L2 segment",
Long: "Add a new L2 segment",
Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error {
manager := cmdContext.GetManager()

ctx, cancel := base.SetupContext(cmd, manager)
defer cancel()

base.SetupProxy(cmd, manager)

input := &serverscom.L2SegmentCreateInput{}
if err := base.ReadInputJSON(path, cmd.InOrStdin(), input); err != nil {
return err
}

scClient := cmdContext.GetClient().SetVerbose(manager.GetVerbose(cmd)).GetScClient()
l2Segment, err := scClient.L2Segments.Create(ctx, *input)
if err != nil {
return err
}

if l2Segment != nil {
formatter := cmdContext.GetOrCreateFormatter(cmd)
return formatter.Format(l2Segment)
}
return nil
},
}

cmd.Flags().StringVarP(&path, "input", "i", "", "path to input file or '-' to read from stdin")
if err := cmd.MarkFlagRequired("input"); err != nil {
log.Fatal(err)
}

return cmd
}
30 changes: 30 additions & 0 deletions cmd/entities/l2_segments/delete.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package l2segments

import (
"github.com/serverscom/srvctl/cmd/base"
"github.com/spf13/cobra"
)

func newDeleteCmd(cmdContext *base.CmdContext) *cobra.Command {
cmd := &cobra.Command{
Use: "delete <l2_segment_id>",
Short: "Delete an L2 segment",
Long: "Delete an L2 segment by id",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
manager := cmdContext.GetManager()

ctx, cancel := base.SetupContext(cmd, manager)
defer cancel()

base.SetupProxy(cmd, manager)

scClient := cmdContext.GetClient().SetVerbose(manager.GetVerbose(cmd)).GetScClient()

l2SegmentID := args[0]
return scClient.L2Segments.Delete(ctx, l2SegmentID)
},
}

return cmd
}
40 changes: 40 additions & 0 deletions cmd/entities/l2_segments/get.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package l2segments

import (
"github.com/serverscom/srvctl/cmd/base"
"github.com/spf13/cobra"
)

func newGetCmd(cmdContext *base.CmdContext) *cobra.Command {
cmd := &cobra.Command{
Use: "get <id>",
Short: "Get an L2 segment",
Long: "Get an L2 segment by id",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
manager := cmdContext.GetManager()

ctx, cancel := base.SetupContext(cmd, manager)
defer cancel()

base.SetupProxy(cmd, manager)

scClient := cmdContext.GetClient().SetVerbose(manager.GetVerbose(cmd)).GetScClient()

l2SegmentID := args[0]

model, err := scClient.L2Segments.Get(ctx, l2SegmentID)
if err != nil {
return err
}

if model != nil {
formatter := cmdContext.GetOrCreateFormatter(cmd)
return formatter.Format(model)
}
return nil
},
}

return cmd
}
45 changes: 45 additions & 0 deletions cmd/entities/l2_segments/l2_segments.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package l2segments

import (
"log"

serverscom "github.com/serverscom/serverscom-go-client/pkg"
"github.com/serverscom/srvctl/cmd/base"
"github.com/serverscom/srvctl/internal/output/entities"
"github.com/spf13/cobra"
)

func NewCmd(cmdContext *base.CmdContext) *cobra.Command {
l2Entity, err := entities.Registry.GetEntityFromValue(serverscom.L2Segment{})
if err != nil {
log.Fatal(err)
}
entitiesMap := make(map[string]entities.EntityInterface)
entitiesMap["l2-segments"] = l2Entity
cmd := &cobra.Command{
Use: "l2-segments",
Short: "Manage L2 segments",
PersistentPreRunE: base.CombinePreRunE(
base.CheckFormatterFlags(cmdContext, entitiesMap),
base.CheckEmptyContexts(cmdContext),
),
Args: base.NoArgs,
Run: base.UsageRun,
}

cmd.AddCommand(
newListCmd(cmdContext),
newListGroupsCmd(cmdContext),
newListMembersCmd(cmdContext),
newListNetworksCmd(cmdContext),
newGetCmd(cmdContext),
newAddCmd(cmdContext),
newUpdateL2Cmd(cmdContext),
newUpdateL2NetworksCmd(cmdContext),
newDeleteCmd(cmdContext),
)

base.AddFormatFlags(cmd)

return cmd
}
Loading
Loading