Skip to content

refactor: cleanup #51

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
dimyjeannot merged 4 commits into from
Mar 18, 2025
Merged

refactor: cleanup #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5abe515
refactor: combining generated models into the sdk to keep things cent…
Mar 15, 2025
ae97155
refactor: combining generated models into the sdk to keep things cent…
Mar 17, 2025
900398a
refactor: combining generated models into the sdk to keep things cent…
Mar 18, 2025
9d458ef
refactor: combining generated models into the sdk to keep things cent…
Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Thumbs.db
README.local.md
**/tempo-data/
**/nats-jetstream-data/
**/data/
*.key


Expand Down
13 changes: 6 additions & 7 deletions apps/clients/public/cli/v2alpha/oeco/cmd/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
charmbraceletloggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/charmbracelet"
nebulav1ca "github.com/openecosystems/ecosystem/libs/partner/go/nebula/ca"
specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/spec/v2"
cliv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/cli/v2alpha"
cmdv2alphapbcmd "github.com/openecosystems/ecosystem/libs/public/go/cli/v2alpha/gen/platform/cmd"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)
Expand All @@ -42,7 +41,7 @@ var (
quiet bool
logToFile bool

configuration *cliv2alphalib.Configuration
configuration *sdkv2alphalib.CLIConfiguration
)

// compileTimeVersion stores the version set at the time of compilation.
Expand Down Expand Up @@ -81,7 +80,7 @@ var RootCmd = &cobra.Command{
Version: Version,
SilenceUsage: true,
PersistentPreRun: func(cmd *cobra.Command, _ []string) {
override := cliv2alphalib.Configuration{
override := sdkv2alphalib.CLIConfiguration{
App: specv2pb.App{
Debug: debug,
Verbose: verbose,
Expand Down Expand Up @@ -114,10 +113,10 @@ func Execute() {
&nebulav1ca.Binding{},
}

c := cliv2alphalib.NewCLI(
c := sdkv2alphalib.NewCLI(
context.Background(),
cliv2alphalib.WithBounds(bounds),
cliv2alphalib.WithConfigurationProvider(&cliv2alphalib.Configuration{}),
sdkv2alphalib.WithCLIBounds(bounds),
sdkv2alphalib.WithCLIConfigurationProvider(&sdkv2alphalib.CLIConfiguration{}),
)

defer c.GracefulShutdown()
Expand All @@ -141,7 +140,7 @@ func Execute() {
}

// AddCommands registers and adds commands to the RootCmd based on the provided SpecSettings.
func AddCommands(settings *cliv2alphalib.Configuration) {
func AddCommands(settings *sdkv2alphalib.CLIConfiguration) {
cmdv2alphapbcmd.CommandRegistry.RegisterCommands()

if settings != nil && settings.Systems != nil {
Expand Down
10 changes: 5 additions & 5 deletions apps/clients/public/cli/v2alpha/oeco/internal/api/iam/v2alpha/create_account.pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"google.golang.org/protobuf/encoding/protojson"

nebulav1ca "github.com/openecosystems/ecosystem/libs/partner/go/nebula/ca"
cliv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/cli/v2alpha"
iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/iam/v2alpha"
iamv2alphapbconnect "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/iam/v2alpha/iamv2alphapbconnect"
iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/iam/v2alpha"
iamv2alphapbconnect "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/iam/v2alpha/iamv2alphapbconnect"

"github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

Expand All @@ -39,7 +39,7 @@ var CreateAccountV2AlphaCmd = &cobra.Command{
Facilitates creating a PKI certificate and getting it signed by an Ecosystem Account Authority ]`,
Run: func(cmd *cobra.Command, _ []string) {
log.Debug("Calling createAccount account")
settings := cmd.Root().Context().Value(sdkv2alphalib.SettingsContextKey).(*cliv2alphalib.Configuration)
settings := cmd.Root().Context().Value(sdkv2alphalib.SettingsContextKey).(*sdkv2alphalib.CLIConfiguration)

_request, err := cmd.Flags().GetString("request")
if err != nil {
Expand Down Expand Up @@ -74,7 +74,7 @@ Facilitates creating a PKI certificate and getting it signed by an Ecosystem Acc
url = "http://" + settings.Platform.Endpoint
}

client := iamv2alphapbconnect.NewAccountServiceClient(httpClient, url, connect.WithInterceptors(cliv2alphalib.NewCLIInterceptor(settings, sdkv2alphalib.Overrides)))
client := iamv2alphapbconnect.NewAccountServiceClient(httpClient, url, connect.WithInterceptors(internal.NewCLIInterceptor(settings, sdkv2alphalib.Overrides)))

response, err4 := client.CreateAccount(context.Background(), request)
if err4 != nil {
Expand Down
2 changes: 1 addition & 1 deletion apps/clients/public/cli/v2alpha/oeco/internal/api/iam/v2alpha/create_account_authority.pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"os"

iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/iam/v2alpha"
iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/iam/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"

nebulav1ca "github.com/openecosystems/ecosystem/libs/partner/go/nebula/ca"
Expand Down
3 changes: 1 addition & 2 deletions apps/clients/public/cli/v2alpha/oeco/internal/ecosytem/v2alpha/ecosystem_create.cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
context "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/context"
ecosystemcreate "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/sections/ecosystem_create"
theme "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/theme"
cliv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/cli/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

Expand All @@ -24,7 +23,7 @@ var Cmd = &cobra.Command{

// createModel initializes an ecosystem model and optionally sets up logging based on the provided command flags.
func createModel(cmd *cobra.Command) *ecosystemcreate.Model {
settings := cmd.Context().Value(sdkv2alphalib.SettingsContextKey).(*cliv2alphalib.Configuration)
settings := cmd.Context().Value(sdkv2alphalib.SettingsContextKey).(*sdkv2alphalib.CLIConfiguration)
logger := cmd.Context().Value(sdkv2alphalib.LoggerContextKey).(*log.Logger)

// c := config.Config{}
Expand Down
11 changes: 11 additions & 0 deletions apps/clients/public/cli/v2alpha/oeco/internal/spec_interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package internal

import (
"context"
"strconv"

"connectrpc.com/connect"
"google.golang.org/protobuf/types/known/timestamppb"

sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)
2 changes: 1 addition & 1 deletion .../v2alpha/oeco/internal/tui/components/form/ecosystem_create_form/ecosystem_create_form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
tasks "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/tasks"
ecosystem "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/tasks/ecosystem"
theme "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/theme"
ecosystemv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/ecosystem/v2alpha"
ecosystemv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/ecosystem/v2alpha"
)

// maxWidth defines the maximum allowed width for the application elements, ensuring consistent layout and readability.
Expand Down
4 changes: 2 additions & 2 deletions apps/clients/public/cli/v2alpha/oeco/internal/tui/context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
config "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/config"
theme "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/theme"

cliv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/cli/v2alpha"
cliv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

// ProgramContext encapsulates the application UI's state, configuration, and behavior for rendering and interaction.
Expand All @@ -31,7 +31,7 @@ type ProgramContext struct {
// Configurable
Section config.SectionType
Page config.PageType
Settings *cliv2alphalib.Configuration
Settings *cliv2alphalib.CLIConfiguration
Config *config.Config
Error error

Expand Down
4 changes: 2 additions & 2 deletions apps/clients/public/cli/v2alpha/oeco/internal/tui/sections/section.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
theme "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/theme"
utils "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/utils"

cliv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/cli/v2alpha"
cliv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

var once sync.Once
Expand All @@ -47,7 +47,7 @@ type NewBaseOptions struct {
Plural string
Pages []contract.Page
CurrentPageID int
Settings *cliv2alphalib.Configuration
Settings *cliv2alphalib.CLIConfiguration
}

// NewBaseModel creates and initializes a new BaseModel instance with the provided context and options.
Expand Down
2 changes: 1 addition & 1 deletion ...s/public/cli/v2alpha/oeco/internal/tui/tasks/account_authority/local_account_authority.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

pcontext "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/context"
nebulav1ca "github.com/openecosystems/ecosystem/libs/partner/go/nebula/ca"
iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/iam/v2alpha"
iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/iam/v2alpha"

sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)
Expand Down
2 changes: 1 addition & 1 deletion apps/clients/public/cli/v2alpha/oeco/internal/tui/tasks/ecosystem/create_ecosytem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
accountauthority "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/tasks/account_authority"
account "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/tasks/local_account"
typev2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/type/v2"
ecosystemv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/ecosystem/v2alpha"
ecosystemv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/ecosystem/v2alpha"
)

// CreateEcosystemMsg represents a command message used for communication or signaling within a program or system.
Expand Down
2 changes: 1 addition & 1 deletion apps/clients/public/cli/v2alpha/oeco/internal/tui/tasks/local_account/local_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
pcontext "github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco/internal/tui/context"
nebulav1ca "github.com/openecosystems/ecosystem/libs/partner/go/nebula/ca"
typev2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/type/v2"
iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/iam/v2alpha"
iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/iam/v2alpha"

sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)
Expand Down
4 changes: 0 additions & 4 deletions apps/connectors/poc/network-account/v1alpha/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ require (
github.com/nbrownus/go-metrics-prometheus v0.0.0-20210712211119-974a6260965f // indirect
github.com/oapi-codegen/oapi-codegen/v2 v2.3.0 // indirect
github.com/oapi-codegen/runtime v1.1.1 // indirect
github.com/openecosystems/ecosystem/libs/poc/go/protobuf v0.0.0-20250314114941-6105506b389b // indirect
github.com/openecosystems/ecosystem/libs/private/go/protobuf v0.0.0-20250314114941-6105506b389b // indirect
github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf v0.0.0-20250314114941-6105506b389b // indirect
github.com/openecosystems/ecosystem/libs/public/go/protobuf v0.0.0-20250314114941-6105506b389b // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions apps/connectors/poc/network-account/v1alpha/listeners/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"

configurationv2alphalib "github.com/openecosystems/ecosystem/libs/partner/go/configuration/v2alpha"
natsnodev1 "github.com/openecosystems/ecosystem/libs/partner/go/nats"
zaploggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/zap"
configurationv2alphalib "github.com/openecosystems/ecosystem/libs/private/go/configuration/v2alpha"
specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/spec/v2"
typev2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/type/v2"
ecosystemv2alphapbmodel "github.com/openecosystems/ecosystem/libs/public/go/model/gen/platform/ecosystem/v2alpha"
ecosystemv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/ecosystem/v2alpha"
ecosystemv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/ecosystem/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/connectors/poc/network-account/v1alpha/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

internal "github.com/openecosystems/ecosystem/apps/connectors/poc/network-account/v1alpha/internal"
listeners "github.com/openecosystems/ecosystem/apps/connectors/poc/network-account/v1alpha/listeners"
configurationv2alphalib "github.com/openecosystems/ecosystem/libs/partner/go/configuration/v2alpha"
natsnodev1 "github.com/openecosystems/ecosystem/libs/partner/go/nats"
nebulav1 "github.com/openecosystems/ecosystem/libs/partner/go/nebula"
zaploggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/zap"
configurationv2alphalib "github.com/openecosystems/ecosystem/libs/private/go/configuration/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/workloads/poc/communications/v1alpha/preference-center/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package main
import (
"context"

configurationv2alphalib "github.com/openecosystems/ecosystem/libs/partner/go/configuration/v2alpha"
natsnodev1 "github.com/openecosystems/ecosystem/libs/partner/go/nats"
nebulav1 "github.com/openecosystems/ecosystem/libs/partner/go/nebula"
zaploggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/zap"
configurationv2alphalib "github.com/openecosystems/ecosystem/libs/private/go/configuration/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/workloads/public/dns/v2alpha/dynamic-dns/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

nebulav1 "github.com/openecosystems/ecosystem/libs/partner/go/nebula"
cryptographyv2alphapbconnect "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/cryptography/v2alpha/cryptographyv2alphapbconnect"
cryptographyv2alphapbconnect "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/cryptography/v2alpha/cryptographyv2alphapbconnect"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
cryptographyv2alphasrv "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha/platform/cryptography/v2alpha"
)
Expand Down
2 changes: 1 addition & 1 deletion apps/workloads/public/ecosystem/v2alpha/ecosystem/account-authority/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package accountauthority
// specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/spec/v2"
// typev2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/type/v2"
// iamv2alphapbmodel "github.com/openecosystems/ecosystem/libs/public/go/model/gen/platform/iam/v2alpha"
// iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/iam/v2alpha"
// iamv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/iam/v2alpha"
// sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
//)
//
Expand Down
7 changes: 3 additions & 4 deletions apps/workloads/public/ecosystem/v2alpha/ecosystem/certificate/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import (
zaploggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/zap"
specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/spec/v2"
typev2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/type/v2"
cryptographyv2alphapbmodel "github.com/openecosystems/ecosystem/libs/public/go/model/gen/platform/cryptography/v2alpha"
cryptographyv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/cryptography/v2alpha"
cryptographyv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/cryptography/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

Expand All @@ -19,13 +18,13 @@ type SignCertificateListener struct{}

// GetConfiguration provides the listener configuration for SignCertificateListener, including subject, queue, and jetstream settings.
func (l *SignCertificateListener) GetConfiguration() *natsnodev1.ListenerConfiguration {
entity := &cryptographyv2alphapbmodel.CertificateSpecEntity{}
entity := &cryptographyv2alphapb.CertificateSpecEntity{}
streamType := natsnodev1.InboundStream{}
subject := natsnodev1.GetMultiplexedRequestSubjectName(streamType.StreamPrefix(), entity.CommandTopic())
queue := natsnodev1.GetQueueGroupName(streamType.StreamPrefix(), entity.TypeName())

return &natsnodev1.ListenerConfiguration{
Entity: &cryptographyv2alphapbmodel.CertificateSpecEntity{},
Entity: &cryptographyv2alphapb.CertificateSpecEntity{},
Subject: subject,
Queue: queue,
StreamType: &natsnodev1.InboundStream{},
Expand Down
14 changes: 7 additions & 7 deletions apps/workloads/public/ecosystem/v2alpha/ecosystem/configuration/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ import (

natsnodev1 "github.com/openecosystems/ecosystem/libs/partner/go/nats"
zaploggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/zap"
configurationv2alphalib "github.com/openecosystems/ecosystem/libs/private/go/configuration/v2alpha"
configurationdefaultsv2alphalib "github.com/openecosystems/ecosystem/libs/private/go/configuration/v2alpha/defaults"
ontologydefaultsv2alphalib "github.com/openecosystems/ecosystem/libs/private/go/ontology/v2alpha/defaults"
specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/spec/v2"
typev2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/type/v2"
configurationv2alphapbmodel "github.com/openecosystems/ecosystem/libs/public/go/model/gen/platform/configuration/v2alpha"
configurationv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/configuration/v2alpha"

configurationv2alphalib "github.com/openecosystems/ecosystem/libs/partner/go/configuration/v2alpha"
configurationdefaultsv2alphalib "github.com/openecosystems/ecosystem/libs/partner/go/configuration/v2alpha/defaults"
configurationv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/configuration/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
ontologydefaultsv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha/ontology"
)

// CreateConfigurationListener is a struct that listens for create configuration events and processes them.
type CreateConfigurationListener struct{}

// GetConfiguration returns the ListenerConfiguration for CreateConfigurationListener, defining subject, queue, entity, and stream settings.
func (l *CreateConfigurationListener) GetConfiguration() *natsnodev1.ListenerConfiguration {
entity := &configurationv2alphapbmodel.ConfigurationSpecEntity{}
entity := &configurationv2alphapb.ConfigurationSpecEntity{}
streamType := natsnodev1.InboundStream{}
subject := natsnodev1.GetMultiplexedRequestSubjectName(streamType.StreamPrefix(), entity.CommandTopic())
queue := natsnodev1.GetQueueGroupName(streamType.StreamPrefix(), entity.TypeName())

return &natsnodev1.ListenerConfiguration{
Entity: &configurationv2alphapbmodel.ConfigurationSpecEntity{},
Entity: &configurationv2alphapb.ConfigurationSpecEntity{},
Subject: subject,
Queue: queue,
StreamType: &natsnodev1.InboundStream{},
Expand Down
9 changes: 4 additions & 5 deletions apps/workloads/public/ecosystem/v2alpha/ecosystem/configuration/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import (
"github.com/nats-io/nats.go/jetstream"
"go.uber.org/zap"

configurationv2alphalib "github.com/openecosystems/ecosystem/libs/partner/go/configuration/v2alpha"
natsnodev1 "github.com/openecosystems/ecosystem/libs/partner/go/nats"
zaploggerv1 "github.com/openecosystems/ecosystem/libs/partner/go/zap"
configurationv2alphalib "github.com/openecosystems/ecosystem/libs/private/go/configuration/v2alpha"
specv2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/spec/v2"
typev2pb "github.com/openecosystems/ecosystem/libs/protobuf/go/protobuf/gen/platform/type/v2"
configurationv2alphapbmodel "github.com/openecosystems/ecosystem/libs/public/go/model/gen/platform/configuration/v2alpha"
configurationv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/protobuf/gen/platform/configuration/v2alpha"
configurationv2alphapb "github.com/openecosystems/ecosystem/libs/public/go/sdk/gen/platform/configuration/v2alpha"
sdkv2alphalib "github.com/openecosystems/ecosystem/libs/public/go/sdk/v2alpha"
)

Expand All @@ -21,13 +20,13 @@ type GetConfigurationListener struct{}

// GetConfiguration creates and returns a ListenerConfiguration for the GetConfigurationListener.
func (l *GetConfigurationListener) GetConfiguration() *natsnodev1.ListenerConfiguration {
entity := &configurationv2alphapbmodel.ConfigurationSpecEntity{}
entity := &configurationv2alphapb.ConfigurationSpecEntity{}
streamType := natsnodev1.InboundStream{}
subject := natsnodev1.GetMultiplexedRequestSubjectName(streamType.StreamPrefix(), entity.EventTopic())
queue := natsnodev1.GetQueueGroupName(streamType.StreamPrefix(), entity.TypeName())

return &natsnodev1.ListenerConfiguration{
Entity: &configurationv2alphapbmodel.ConfigurationSpecEntity{},
Entity: &configurationv2alphapb.ConfigurationSpecEntity{},
Subject: subject,
Queue: queue,
StreamType: &natsnodev1.InboundStream{},
Expand Down
Loading
Loading