Skip to content

Commit

Permalink
no events for storage provider
Browse files Browse the repository at this point in the history
Signed-off-by: jkoberg <[email protected]>
  • Loading branch information
kobergj committed Jan 31, 2023
1 parent dc18940 commit 041bd5b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 29 deletions.
3 changes: 2 additions & 1 deletion services/storage-users/pkg/revaconfig/dataprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package revaconfig

import "github.com/owncloud/ocis/v2/services/storage-users/pkg/config"

// DataProviderDrivers are the storage drivers for the data provider
func DataProviderDrivers(cfg *config.Config) map[string]interface{} {
return map[string]interface{}{
"eos": map[string]interface{}{
Expand Down Expand Up @@ -98,7 +99,7 @@ func DataProviderDrivers(cfg *config.Config) map[string]interface{} {
"permissionssvc_tls_mode": cfg.Commons.GRPCClientTLS.Mode,
"max_acquire_lock_cycles": cfg.Drivers.OCIS.MaxAcquireLockCycles,
"lock_cycle_duration_factor": cfg.Drivers.OCIS.LockCycleDurationFactor,
// "asyncfileuploads": cfg.Drivers.OCIS.AsyncUploads,
"asyncfileuploads": cfg.Drivers.OCIS.AsyncUploads,
"statcache": map[string]interface{}{
"cache_store": cfg.Cache.Store,
"cache_nodes": cfg.Cache.Nodes,
Expand Down
56 changes: 28 additions & 28 deletions services/storage-users/pkg/revaconfig/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,25 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
"permissionssvc_tls_mode": cfg.Commons.GRPCClientTLS.Mode,
"max_acquire_lock_cycles": cfg.Drivers.OCIS.MaxAcquireLockCycles,
"lock_cycle_duration_factor": cfg.Drivers.OCIS.LockCycleDurationFactor,
"asyncfileuploads": cfg.Drivers.OCIS.AsyncUploads,
// "asyncfileuploads": cfg.Drivers.OCIS.AsyncUploads,
"statcache": map[string]interface{}{
"cache_store": cfg.Cache.Store,
"cache_nodes": cfg.Cache.Nodes,
"cache_database": cfg.Cache.Database,
},
"events": map[string]interface{}{
"natsaddress": cfg.Events.Addr,
"natsclusterid": cfg.Events.ClusterID,
"tlsinsecure": cfg.Events.TLSInsecure,
"tlsrootcacertificate": cfg.Events.TLSRootCaCertPath,
"numconsumers": cfg.Events.NumConsumers,
},
"tokens": map[string]interface{}{
"transfer_shared_secret": cfg.Commons.TransferSecret,
"transfer_expires": cfg.TransferExpires,
"download_endpoint": cfg.DataServerURL,
"datagateway_endpoint": cfg.DataGatewayURL,
},
// "events": map[string]interface{}{
// "natsaddress": cfg.Events.Addr,
// "natsclusterid": cfg.Events.ClusterID,
// "tlsinsecure": cfg.Events.TLSInsecure,
// "tlsrootcacertificate": cfg.Events.TLSRootCaCertPath,
// "numconsumers": cfg.Events.NumConsumers,
// },
// "tokens": map[string]interface{}{
// "transfer_shared_secret": cfg.Commons.TransferSecret,
// "transfer_expires": cfg.TransferExpires,
// "download_endpoint": cfg.DataServerURL,
// "datagateway_endpoint": cfg.DataGatewayURL,
// },
},
"s3": map[string]interface{}{
"enable_home": false,
Expand Down Expand Up @@ -144,25 +144,25 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
"s3.bucket": cfg.Drivers.S3NG.Bucket,
"max_acquire_lock_cycles": cfg.Drivers.S3NG.MaxAcquireLockCycles,
"lock_cycle_duration_factor": cfg.Drivers.S3NG.LockCycleDurationFactor,
"asyncfileuploads": cfg.Drivers.OCIS.AsyncUploads,
// "asyncfileuploads": cfg.Drivers.OCIS.AsyncUploads,
"statcache": map[string]interface{}{
"cache_store": cfg.Cache.Store,
"cache_nodes": cfg.Cache.Nodes,
"cache_database": cfg.Cache.Database,
},
"events": map[string]interface{}{
"natsaddress": cfg.Events.Addr,
"natsclusterid": cfg.Events.ClusterID,
"tlsinsecure": cfg.Events.TLSInsecure,
"tlsrootcacertificate": cfg.Events.TLSRootCaCertPath,
"numconsumers": cfg.Events.NumConsumers,
},
"tokens": map[string]interface{}{
"transfer_shared_secret": cfg.Commons.TransferSecret,
"transfer_expires": cfg.TransferExpires,
"download_endpoint": cfg.DataServerURL,
"datagateway_endpoint": cfg.DataGatewayURL,
},
// "events": map[string]interface{}{
// "natsaddress": cfg.Events.Addr,
// "natsclusterid": cfg.Events.ClusterID,
// "tlsinsecure": cfg.Events.TLSInsecure,
// "tlsrootcacertificate": cfg.Events.TLSRootCaCertPath,
// "numconsumers": cfg.Events.NumConsumers,
// },
// "tokens": map[string]interface{}{
// "transfer_shared_secret": cfg.Commons.TransferSecret,
// "transfer_expires": cfg.TransferExpires,
// "download_endpoint": cfg.DataServerURL,
// "datagateway_endpoint": cfg.DataGatewayURL,
// },
},
}
}

0 comments on commit 041bd5b

Please sign in to comment.