Skip to content

Commit bfc8088

Browse files
dimyjeannotdimyjeannot
authored
feat: OECO Cleanup 28 (#60)
* fix: small bugs * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * chore(release): publish - project: go-protobuf-sdk-v2beta 0.1.0 * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries * chore(release): publish - project: go-protobuf-sdk-v2beta 0.2.0 * feat: promoting the sdk to v2beta; upgrading libraries * chore(release): publish - project: go-protobuf-sdk-v2beta 0.3.0 * feat: promoting the sdk to v2beta; upgrading libraries * feat: promoting the sdk to v2beta; upgrading libraries --------- Co-authored-by: Dimy Jeannot <>
1 parent 4442584 commit bfc8088

File tree

708 files changed

+3901
-31437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

708 files changed

+3901
-31437
lines changed

‎apps/clients/public/cli/v2alpha/oeco/cmd/cli.go‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,10 @@ import (
1313
ecosystemv2alphapbint "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/ecosytem/v2alpha"
1414
enclavev2alphapbint "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/enclave"
1515
markdown "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/components/markdown"
16-
charmbraceletloggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/charmbracelet"
17-
nebulav1ca "github.com/openecosystems/ecosystem/libs/partner/go/nebula/ca"
18-
specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/spec/v2"
19-
"github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/communication/v1alpha/communicationv1alphapbcli"
20-
"github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/communication/v1beta/communicationv1betapbcli"
21-
"github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/configuration/v2alpha/configurationv2alphapbcli"
22-
"github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/cryptography/v2alpha/cryptographyv2alphapbcli"
23-
"github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/ecosystem/v2alpha/ecosystemv2alphapbcli"
24-
"github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/iam/v2alpha/iamv2alphapbcli"
25-
"github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/system/v2alpha/systemv2alphapbcli"
26-
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
16+
specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/sdk/v2beta/gen/platform/spec/v2"
17+
sdkv2betalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2beta"
18+
charmbraceletloggerv1 "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2beta/bindings/charmbracelet"
19+
nebulav1ca "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2beta/bindings/nebula/ca"
2720
)
2821

2922
// DefaultVersion defines the fallback version identifier when no compile-time version is provided.
@@ -47,7 +40,7 @@ var (
4740
quiet bool
4841
logToFile bool
4942

50-
configuration *sdkv2alphalib.CLIConfiguration
43+
configuration *sdkv2betalib.CLIConfiguration
5144
)
5245

5346
// compileTimeVersion stores the version set at the time of compilation.
@@ -86,7 +79,7 @@ var RootCmd = &cobra.Command{
8679
Version: Version,
8780
SilenceUsage: true,
8881
PersistentPreRun: func(cmd *cobra.Command, _ []string) {
89-
override := sdkv2alphalib.CLIConfiguration{
82+
override := sdkv2betalib.CLIConfiguration{
9083
App: specv2pb.App{
9184
Debug: debug,
9285
Verbose: verbose,
@@ -102,27 +95,27 @@ var RootCmd = &cobra.Command{
10295
LogToFile: logToFile,
10396
},
10497
})
105-
sdkv2alphalib.Merge(&override, configuration)
106-
cmd.SetContext(context.WithValue(cmd.Root().Context(), sdkv2alphalib.SettingsContextKey, &override))
107-
cmd.SetContext(context.WithValue(cmd.Context(), sdkv2alphalib.LoggerContextKey, charmbraceletloggerv1.Bound.Logger))
108-
cmd.SetContext(context.WithValue(cmd.Context(), sdkv2alphalib.NebulaCAContextKey, nebulav1ca.Bound))
98+
sdkv2betalib.Merge(&override, configuration)
99+
cmd.SetContext(context.WithValue(cmd.Root().Context(), sdkv2betalib.SettingsContextKey, &override))
100+
cmd.SetContext(context.WithValue(cmd.Context(), sdkv2betalib.LoggerContextKey, charmbraceletloggerv1.Bound.Logger))
101+
cmd.SetContext(context.WithValue(cmd.Context(), sdkv2betalib.NebulaCAContextKey, nebulav1ca.Bound))
109102
},
110103
}
111104

112105
// Execute runs the main command-line interface (CLI) program logic, initializing settings, context, and commands.
113106
func Execute() {
114-
bounds := []sdkv2alphalib.Binding{
107+
bounds := []sdkv2betalib.Binding{
115108
&charmbraceletloggerv1.Binding{},
116109
//&natsnodev1.Binding{SpecEventListeners: []natsnodev1.SpecEventListener{
117110
//
118111
//}},
119112
&nebulav1ca.Binding{},
120113
}
121114

122-
c := sdkv2alphalib.NewCLI(
115+
c := sdkv2betalib.NewCLI(
123116
context.Background(),
124-
sdkv2alphalib.WithCLIBounds(bounds),
125-
sdkv2alphalib.WithCLIConfigurationProvider(&sdkv2alphalib.CLIConfiguration{}),
117+
sdkv2betalib.WithCLIBounds(bounds),
118+
sdkv2betalib.WithCLIConfigurationProvider(&sdkv2betalib.CLIConfiguration{}),
126119
)
127120

128121
defer c.GracefulShutdown()
@@ -146,21 +139,17 @@ func Execute() {
146139
}
147140

148141
// AddCommands registers and adds commands to the RootCmd based on the provided SpecSettings.
149-
func AddCommands(settings *sdkv2alphalib.CLIConfiguration) {
142+
func AddCommands(settings *sdkv2betalib.CLIConfiguration) {
150143
// TODO: Make this dynamic
151-
sdkv2alphalib.CommandRegistry.RegisterCommand(sdkv2alphalib.FullCommandName{Name: "communication", Version: "v1alpha"}, communicationv1alphapbcli.SystemCmd)
152-
sdkv2alphalib.CommandRegistry.RegisterCommand(sdkv2alphalib.FullCommandName{Name: "communication", Version: "v1beta"}, communicationv1betapbcli.SystemCmd)
153-
sdkv2alphalib.CommandRegistry.RegisterCommand(sdkv2alphalib.FullCommandName{Name: "configuration", Version: "v2alpha"}, configurationv2alphapbcli.SystemCmd)
154-
sdkv2alphalib.CommandRegistry.RegisterCommand(sdkv2alphalib.FullCommandName{Name: "cryptography", Version: "v2alpha"}, cryptographyv2alphapbcli.SystemCmd)
155-
sdkv2alphalib.CommandRegistry.RegisterCommand(sdkv2alphalib.FullCommandName{Name: "ecosystem", Version: "v2alpha"}, ecosystemv2alphapbcli.SystemCmd)
156-
sdkv2alphalib.CommandRegistry.RegisterCommand(sdkv2alphalib.FullCommandName{Name: "iam", Version: "v2alpha"}, iamv2alphapbcli.SystemCmd)
157-
sdkv2alphalib.CommandRegistry.RegisterCommand(sdkv2alphalib.FullCommandName{Name: "system", Version: "v2alpha"}, systemv2alphapbcli.SystemCmd)
144+
// sdkv2betalib.CommandRegistry.RegisterCommand(sdkv2betalib.FullCommandName{Name: "cryptography", Version: "v2alpha"}, cryptographyv2alphapbcli.SystemCmd)
145+
// sdkv2betalib.CommandRegistry.RegisterCommand(sdkv2betalib.FullCommandName{Name: "ecosystem", Version: "v2alpha"}, ecosystemv2alphapbcli.SystemCmd)
146+
// sdkv2betalib.CommandRegistry.RegisterCommand(sdkv2betalib.FullCommandName{Name: "iam", Version: "v2alpha"}, iamv2alphapbcli.SystemCmd)
158147

159-
sdkv2alphalib.CommandRegistry.RegisterCommands()
148+
sdkv2betalib.CommandRegistry.RegisterCommands()
160149

161150
if settings != nil && settings.Systems != nil {
162151
for _, system := range settings.Systems { //nolint:copylocks,govet
163-
command, err := sdkv2alphalib.CommandRegistry.GetCommandByFullCommandName(sdkv2alphalib.FullCommandName{
152+
command, err := sdkv2betalib.CommandRegistry.GetCommandByFullCommandName(sdkv2betalib.FullCommandName{
164153
Name: system.Name,
165154
Version: system.Version,
166155
})

‎apps/clients/public/cli/v2alpha/oeco/go.mod‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,22 @@ module github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco
22

33
go 1.23.4
44

5-
toolchain go1.23.4
6-
75
require (
8-
connectrpc.com/connect v1.17.0
9-
github.com/charmbracelet/bubbles v0.20.0
10-
github.com/charmbracelet/bubbletea v1.3.3
6+
connectrpc.com/connect v1.18.1
7+
github.com/apex/log v1.9.0
8+
github.com/charmbracelet/bubbles v0.21.0
9+
github.com/charmbracelet/bubbletea v1.3.5
1110
github.com/charmbracelet/glamour v0.6.0
1211
github.com/charmbracelet/huh v0.6.0
13-
github.com/charmbracelet/huh/spinner v0.0.0-20250213143221-71c9d72e6770
14-
github.com/charmbracelet/lipgloss v1.0.0
15-
github.com/charmbracelet/log v0.3.1
16-
github.com/go-playground/validator/v10 v10.23.0
17-
github.com/google/gopacket v1.1.19
12+
github.com/charmbracelet/lipgloss v1.1.0
13+
github.com/charmbracelet/log v0.4.2
14+
github.com/go-playground/validator/v10 v10.26.0
1815
github.com/mitchellh/hashstructure/v2 v2.0.2
19-
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a
20-
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
21-
github.com/spf13/cobra v1.8.1
22-
google.golang.org/protobuf v1.36.1
23-
gopkg.in/yaml.v2 v2.2.8
16+
github.com/muesli/termenv v0.16.0
17+
github.com/segmentio/ksuid v1.0.4
18+
github.com/spf13/cobra v1.9.1
19+
google.golang.org/protobuf v1.36.6
20+
gopkg.in/yaml.v2 v2.4.0
2421
)
2522

2623
require (
@@ -29,44 +26,46 @@ require (
2926
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3027
github.com/aymerick/douceur v0.2.0 // indirect
3128
github.com/catppuccin/go v0.2.0 // indirect
32-
github.com/charmbracelet/x/ansi v0.8.0 // indirect
29+
github.com/charmbracelet/colorprofile v0.3.1 // indirect
30+
github.com/charmbracelet/x/ansi v0.9.2 // indirect
31+
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
3332
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
3433
github.com/charmbracelet/x/term v0.2.1 // indirect
3534
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
36-
github.com/dlclark/regexp2 v1.4.0 // indirect
35+
github.com/dlclark/regexp2 v1.11.0 // indirect
3736
github.com/dustin/go-humanize v1.0.1 // indirect
3837
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
39-
github.com/fatih/color v1.14.1 // indirect
40-
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
38+
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
4139
github.com/go-logfmt/logfmt v0.6.0 // indirect
4240
github.com/go-playground/locales v0.14.1 // indirect
4341
github.com/go-playground/universal-translator v0.18.1 // indirect
44-
github.com/google/go-cmp v0.6.0 // indirect
42+
github.com/google/go-cmp v0.7.0 // indirect
4543
github.com/gorilla/css v1.0.0 // indirect
4644
github.com/inconshreveable/mousetrap v1.1.0 // indirect
45+
github.com/kr/pretty v0.3.1 // indirect
4746
github.com/leodido/go-urn v1.4.0 // indirect
4847
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
49-
github.com/mattn/go-colorable v0.1.13 // indirect
5048
github.com/mattn/go-isatty v0.0.20 // indirect
5149
github.com/mattn/go-localereader v0.0.1 // indirect
5250
github.com/mattn/go-runewidth v0.0.16 // indirect
53-
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
51+
github.com/microcosm-cc/bluemonday v1.0.25 // indirect
5452
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
5553
github.com/muesli/cancelreader v0.2.2 // indirect
5654
github.com/muesli/reflow v0.3.0 // indirect
5755
github.com/olekukonko/tablewriter v0.0.5 // indirect
5856
github.com/pkg/errors v0.9.1 // indirect
5957
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6058
github.com/rivo/uniseg v0.4.7 // indirect
59+
github.com/rogpeppe/go-internal v1.14.1 // indirect
6160
github.com/spf13/pflag v1.0.6 // indirect
62-
github.com/stretchr/testify v1.9.0 // indirect
61+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
6362
github.com/yuin/goldmark v1.5.2 // indirect
6463
github.com/yuin/goldmark-emoji v1.0.1 // indirect
65-
golang.org/x/crypto v0.28.0 // indirect
66-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
67-
golang.org/x/net v0.30.0 // indirect
68-
golang.org/x/sync v0.11.0 // indirect
69-
golang.org/x/sys v0.30.0 // indirect
70-
golang.org/x/text v0.21.0 // indirect
71-
golang.org/x/time v0.7.0 // indirect
64+
golang.org/x/crypto v0.39.0 // indirect
65+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
66+
golang.org/x/net v0.41.0 // indirect
67+
golang.org/x/sync v0.15.0 // indirect
68+
golang.org/x/sys v0.33.0 // indirect
69+
golang.org/x/text v0.26.0 // indirect
70+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
7271
)

0 commit comments

Comments
 (0)