remove deprecated config option
This commit is contained in:
@@ -1,8 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
func TracingService(enabled bool) string {
|
|
||||||
if enabled {
|
|
||||||
return "opentelemetry"
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
@@ -95,7 +95,6 @@ func authBasicConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]in
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ func authBearerConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]i
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -122,7 +122,6 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -113,7 +113,6 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -99,7 +99,6 @@ func groupsConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inter
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -109,7 +109,6 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ func storageHomeConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -142,7 +142,6 @@ func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]in
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ func storagePublicLinkConfigFromStruct(c *cli.Context, cfg *config.Config) map[s
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ func storageUsersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
@@ -102,7 +102,6 @@ func usersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interf
|
|||||||
"tracing_enabled": cfg.Tracing.Enabled,
|
"tracing_enabled": cfg.Tracing.Enabled,
|
||||||
"tracing_endpoint": cfg.Tracing.Endpoint,
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
||||||
"tracing_collector": cfg.Tracing.Collector,
|
"tracing_collector": cfg.Tracing.Collector,
|
||||||
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
|
|
||||||
"tracing_service_name": c.Command.Name,
|
"tracing_service_name": c.Command.Name,
|
||||||
},
|
},
|
||||||
"shared": map[string]interface{}{
|
"shared": map[string]interface{}{
|
||||||
|
|||||||
Reference in New Issue
Block a user