diff --git a/services/ocm/pkg/config/config.go b/services/ocm/pkg/config/config.go index 395613590e..27236f18dd 100644 --- a/services/ocm/pkg/config/config.go +++ b/services/ocm/pkg/config/config.go @@ -83,10 +83,10 @@ type GRPCConfig struct { } type ScienceMesh struct { - Prefix string `yaml:"prefix" env:"OCM_SCIENCEMESH_PREFIX" desc:"URL path prefix for the ScienceMesh service. Note that the string must not start with '/'." introductionVersion:"1.0.0"` - MeshDirectoryURL string `yaml:"science_mesh_directory_url" env:"OCM_MESH_DIRECTORY_URL" desc:"URL of the mesh directory service." introductionVersion:"1.0.0"` - Federations string `yaml:"federations_file" env:"OCM_FEDERATIONS_FILE" desc:"Path to the JSON file where OCM federations data will be stored." introductionVersion:"3.5.0"` - InviteAcceptDialog string `yaml:"invite_accept_dialog" env:"OCM_INVITE_ACCEPT_DIALOG" desc:"/open-cloud-mesh/accept-invite;The frontend URL where to land when receiving an invitation" introductionVersion:"3.5.0"` + Prefix string `yaml:"prefix" env:"OCM_SCIENCEMESH_PREFIX" desc:"URL path prefix for the ScienceMesh service. Note that the string must not start with '/'." introductionVersion:"1.0.0"` + MeshDirectoryURL string `yaml:"science_mesh_directory_url" env:"OCM_MESH_DIRECTORY_URL" desc:"URL of the mesh directory service." introductionVersion:"1.0.0"` + DirectoryServiceURLs string `yaml:"directory_service_urls" env:"OCM_DIRECTORY_SERVICE_URLS" desc:"Space delimited URLs of the directory services." introductionVersion:"3.5.0"` + InviteAcceptDialog string `yaml:"invite_accept_dialog" env:"OCM_INVITE_ACCEPT_DIALOG" desc:"/open-cloud-mesh/accept-invite;The frontend URL where to land when receiving an invitation" introductionVersion:"3.5.0"` } type OCMD struct { diff --git a/services/ocm/pkg/config/defaults/defaultconfig.go b/services/ocm/pkg/config/defaults/defaultconfig.go index f9d3a80000..0109072962 100644 --- a/services/ocm/pkg/config/defaults/defaultconfig.go +++ b/services/ocm/pkg/config/defaults/defaultconfig.go @@ -91,7 +91,6 @@ func DefaultConfig() *config.Config { }, ScienceMesh: config.ScienceMesh{ Prefix: "sciencemesh", - Federations: filepath.Join(defaults.BaseConfigPath(), "federations.json"), InviteAcceptDialog: "/open-cloud-mesh/accept-invite", }, OCMD: config.OCMD{ diff --git a/services/ocm/pkg/revaconfig/config.go b/services/ocm/pkg/revaconfig/config.go index a79e735aae..db784883d2 100644 --- a/services/ocm/pkg/revaconfig/config.go +++ b/services/ocm/pkg/revaconfig/config.go @@ -71,12 +71,12 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter }, }, "sciencemesh": map[string]interface{}{ - "prefix": cfg.ScienceMesh.Prefix, - "smtp_credentials": map[string]string{}, - "gatewaysvc": cfg.Reva.Address, - "mesh_directory_url": cfg.ScienceMesh.MeshDirectoryURL, - "federations_file": cfg.ScienceMesh.Federations, - "provider_domain": providerDomain, + "prefix": cfg.ScienceMesh.Prefix, + "smtp_credentials": map[string]string{}, + "gatewaysvc": cfg.Reva.Address, + "mesh_directory_url": cfg.ScienceMesh.MeshDirectoryURL, + "directory_service_urls": cfg.ScienceMesh.DirectoryServiceURLs, + "provider_domain": providerDomain, "events": map[string]interface{}{ "natsaddress": cfg.Events.Endpoint, "natsclusterid": cfg.Events.Cluster,