Skip to content

Rename federation create to add-member and update terminology #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergioLangaritaBenitez merged 5 commits into from
Jun 25, 2026
Merged

Rename federation create to add-member and update terminology #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5db1a4c
feat: add federation commands
SergioLangaritaBenitez May 20, 2026
18a20d1
resolve conflict
SergioLangaritaBenitez May 21, 2026
5c55fb6
update oscar-cli to service version of 4.1.0
SergioLangaritaBenitez Jun 10, 2026
9a1ff14
resolve conflict
SergioLangaritaBenitez Jun 10, 2026
ccf62ea
Rename federation create to add-member and update replica terminology…
SergioLangaritaBenitez Jun 19, 2026
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
4 changes: 2 additions & 2 deletions cmd/federation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func federationFunc(cmd *cobra.Command, args []string) {
func makeFederationCmd() *cobra.Command {
federationCmd := &cobra.Command{
Use: "federation",
Short: "Manage service federation replicas",
Short: "Manage service federation members",
Args: cobra.NoArgs,
Run: federationFunc,
}
Expand All @@ -36,7 +36,7 @@ func makeFederationCmd() *cobra.Command {
federationCmd.PersistentFlags().StringVar(&configPath, "config", defaultConfigPath, "set the location of the config file (YAML or JSON)")

federationCmd.AddCommand(makeFederationGetCmd())
federationCmd.AddCommand(makeFederationCreateCmd())
federationCmd.AddCommand(makeFederationAddMemberCmd())
federationCmd.AddCommand(makeFederationUpdateCmd())
federationCmd.AddCommand(makeFederationDeleteCmd())

Expand Down
19 changes: 10 additions & 9 deletions cmd/federation_create.go → cmd/federation_add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/spf13/cobra"
)

func federationCreateFunc(cmd *cobra.Command, args []string) error {
func federationAddMemberFunc(cmd *cobra.Command, args []string) error {
conf, err := config.ReadConfig(configPath)
if err != nil {
return err
Expand Down Expand Up @@ -55,22 +55,23 @@ func federationCreateFunc(cmd *cobra.Command, args []string) error {
return err
}

fmt.Fprintf(cmd.OutOrStdout(), "Federation replica created for service %q\n", args[0])
fmt.Fprintf(cmd.OutOrStdout(), "Federation member added for service %q\n", args[0])

return nil
}

func makeFederationCreateCmd() *cobra.Command {
func makeFederationAddMemberCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "create SERVICE_NAME",
Short: "Create a federation replica for a service",
Args: cobra.ExactArgs(1),
RunE: federationCreateFunc,
Use: "add-member SERVICE_NAME",
Short: "Add a federation member to a service",
Aliases: []string{"add", "a"},
Args: cobra.ExactArgs(1),
RunE: federationAddMemberFunc,
}

cmd.Flags().String("type", "oscar", "replica type (oscar or endpoint)")
cmd.Flags().String("type", "oscar", "type (oscar or endpoint)")
cmd.Flags().String("cluster-id", "", "cluster ID (for oscar type)")
cmd.Flags().String("service-name", "", "service name in the replica cluster (for oscar type)")
cmd.Flags().String("service-name", "", "service name in the member federation (for oscar type)")
cmd.Flags().String("url", "", "endpoint URL (for endpoint type)")
cmd.Flags().Uint("priority", 0, "delegation priority (0 = highest)")

Expand Down
6 changes: 3 additions & 3 deletions cmd/federation_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ func federationDeleteFunc(cmd *cobra.Command, args []string) error {
return err
}

fmt.Fprintf(cmd.OutOrStdout(), "Federation replicas deleted for service %q\n", args[0])
fmt.Fprintf(cmd.OutOrStdout(), "Federation members deleted for service %q\n", args[0])

return nil
}

func makeFederationDeleteCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "delete SERVICE_NAME",
Short: "Delete federation replicas of a service",
Short: "Delete federation members of a service",
Args: cobra.ExactArgs(1),
Aliases: []string{"rm"},
Aliases: []string{"rm", "del", "d", "delete-member", "remove-member"},
RunE: federationDeleteFunc,
}

Expand Down
8 changes: 4 additions & 4 deletions cmd/federation_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func federationGetFunc(cmd *cobra.Command, args []string) error {
}
w.Flush()
if len(replicas) == 0 {
fmt.Fprintln(cmd.OutOrStdout(), "No federation replicas found")
fmt.Fprintln(cmd.OutOrStdout(), "No federation members found")
}
default:
for _, r := range replicas {
Expand All @@ -67,7 +67,7 @@ func federationGetFunc(cmd *cobra.Command, args []string) error {
fmt.Fprintf(cmd.OutOrStdout(), "Priority: %d\n\n", r.Priority)
}
if len(replicas) == 0 {
fmt.Fprintln(cmd.OutOrStdout(), "No federation replicas found")
fmt.Fprintln(cmd.OutOrStdout(), "No federation members found")
}
}

Expand All @@ -77,9 +77,9 @@ func federationGetFunc(cmd *cobra.Command, args []string) error {
func makeFederationGetCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "get SERVICE_NAME",
Short: "Get federated replicas of a service",
Short: "Get federated members of a service",
Args: cobra.ExactArgs(1),
Aliases: []string{"g"},
Aliases: []string{"get-federation", "g"},
RunE: federationGetFunc,
}

Expand Down
15 changes: 8 additions & 7 deletions cmd/federation_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,23 @@ func federationUpdateFunc(cmd *cobra.Command, args []string) error {
return err
}

fmt.Fprintf(cmd.OutOrStdout(), "Federation replica updated for service %q\n", args[0])
fmt.Fprintf(cmd.OutOrStdout(), "Federation member updated for service %q\n", args[0])

return nil
}

func makeFederationUpdateCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "update SERVICE_NAME",
Short: "Update a federation replica for a service",
Args: cobra.ExactArgs(1),
RunE: federationUpdateFunc,
Use: "update SERVICE_NAME",
Short: "Update a federation member for a service",
Args: cobra.ExactArgs(1),
Aliases: []string{"update-member", "u"},
RunE: federationUpdateFunc,
}

cmd.Flags().String("type", "oscar", "replica type (oscar or endpoint)")
cmd.Flags().String("type", "oscar", "type (oscar or endpoint)")
cmd.Flags().String("cluster-id", "", "cluster ID (for oscar type)")
cmd.Flags().String("service-name", "", "service name in the replica cluster (for oscar type)")
cmd.Flags().String("service-name", "", "service name in the member federation (for oscar type)")
cmd.Flags().String("url", "", "endpoint URL (for endpoint type)")
cmd.Flags().Uint("priority", 0, "delegation priority (0 = highest)")

Expand Down
45 changes: 22 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/schollz/progressbar/v3 v3.13.1
github.com/spf13/cobra v1.10.1
golang.org/x/net v0.48.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/text v0.32.0 // indirect
k8s.io/api v0.34.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
github.com/spf13/cobra v1.10.2
golang.org/x/net v0.51.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.34.0 // indirect
k8s.io/api v0.35.3 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
)

require (
github.com/gdamore/tcell/v2 v2.8.1
github.com/golang-jwt/jwt/v5 v5.2.2
github.com/grycap/oscar/v4 v4.0.0
github.com/golang-jwt/jwt/v5 v5.3.0
github.com/grycap/oscar/v4 v4.1.0
github.com/indigo-dc/liboidcagent-go v0.3.0
github.com/rivo/tview v0.42.0
golang.org/x/term v0.38.0
golang.org/x/term v0.40.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -35,8 +35,8 @@ require (
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/gdamore/encoding v1.0.1 // indirect
github.com/go-openapi/jsonpointer v0.22.3 // indirect
github.com/go-openapi/jsonreference v0.21.3 // indirect
github.com/go-openapi/jsonpointer v0.22.4 // indirect
github.com/go-openapi/jsonreference v0.21.4 // indirect
github.com/go-openapi/swag v0.25.4 // indirect
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
github.com/go-openapi/swag/conv v0.25.4 // indirect
Expand All @@ -49,7 +49,6 @@ require (
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grycap/cdmi-client-go v0.1.1 // indirect
Expand All @@ -65,25 +64,25 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/stretchr/testify v1.11.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.46.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/oauth2 v0.35.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/protobuf v1.36.10 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/apimachinery v0.34.2 // indirect
k8s.io/client-go v0.34.2 // indirect
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
sigs.k8s.io/controller-runtime v0.22.4 // indirect
k8s.io/apimachinery v0.35.3 // indirect
k8s.io/client-go v0.35.3 // indirect
k8s.io/component-helpers v0.35.3 // indirect
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
sigs.k8s.io/controller-runtime v0.23.3 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/kueue v0.15.0 // indirect
sigs.k8s.io/kueue v0.17.2 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading
Loading