Renamed function

cs3org · May 16, 2024 · 3ea7cb3 · 3ea7cb3
1 parent 04b03fa
commit 3ea7cb3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/internal/grpc/services/ocminvitemanager/ocminvitemanager.go b/internal/grpc/services/ocminvitemanager/ocminvitemanager.go
@@ -112,7 +112,7 @@ func New(ctx context.Context, m map[string]interface{}) (rgrpc.Service, error) {
 	service := &service{
 		conf:      &c,
 		repo:      repo,
-		ocmClient: ocmd.NewOCMClient(time.Duration(c.OCMClientTimeout)*time.Second, c.OCMClientInsecure),
+		ocmClient: ocmd.NewClient(time.Duration(c.OCMClientTimeout)*time.Second, c.OCMClientInsecure),
 	}
 	return service, nil
 }

diff --git a/internal/grpc/services/ocmshareprovider/ocmshareprovider.go b/internal/grpc/services/ocmshareprovider/ocmshareprovider.go
@@ -129,7 +129,7 @@ func New(ctx context.Context, m map[string]interface{}) (rgrpc.Service, error) {
 	}
 	walker := walker.NewWalker(gateway)
 
-	ocmcl := ocmd.NewOCMClient(time.Duration(c.ClientTimeout)*time.Second, c.ClientInsecure)
+	ocmcl := ocmd.NewClient(time.Duration(c.ClientTimeout)*time.Second, c.ClientInsecure)
 	service := &service{
 		conf:       &c,
 		repo:       repo,
@@ -175,7 +175,7 @@ func getResourceType(info *providerpb.ResourceInfo) string {
 
 func (s *service) webdavURL(share *ocm.Share) string {
 	// the url is expected to be in the form https://ourserver/remote.php/dav/ocm/{ShareId}, see c.WebdavRoot in ocmprovider.go
-	// TODO(lopresti) take the root from http.services.ocmprovider's config
+	// TODO(lopresti) take the root from http.services.wellknown.ocmprovider's config
 	p, _ := url.JoinPath(s.conf.WebDAVEndpoint, "/remote.php/dav/ocm", share.Id.OpaqueId)
 	return p
 }

diff --git a/internal/http/services/opencloudmesh/ocmd/client.go b/internal/http/services/opencloudmesh/ocmd/client.go
@@ -59,8 +59,8 @@ type OCMClient struct {
 	client *http.Client
 }
 
-// NewOCMClient returns a new OCMClient.
-func NewOCMClient(timeout time.Duration, insecure bool) *OCMClient {
+// NewClient returns a new OCMClient.
+func NewClient(timeout time.Duration, insecure bool) *OCMClient {
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure},
 	}

diff --git a/internal/http/services/opencloudmesh/ocmd/shares.go b/internal/http/services/opencloudmesh/ocmd/shares.go
@@ -279,7 +279,7 @@ func discoverOcmWebdavRoot(r *http.Request) (string, error) {
 	log := appctx.GetLogger(ctx)
 	log.Debug().Str("sender", r.Host).Msg("received OCM 1.0 share, attempting to discover sender endpoint")
 
-	ocmClient := NewOCMClient(time.Duration(10)*time.Second, true)
+	ocmClient := NewClient(time.Duration(10)*time.Second, true)
 	ocmCaps, err := ocmClient.Discover(ctx, r.Host)
 	if err != nil {
 		log.Warn().Str("sender", r.Host).Err(err).Msg("failed to discover OCM sender")