refactor: url → endpoint
https://github.com/ipfs/go-ipfs/pull/7828#discussion_r543520089
Marcin Rataj committed
Dec 15, 2020 at 23:24 UTC
fc4095cfb3f8c2c958a9bcd583698070ed1f38d5
1 file changed
+9
-11
core/commands/pin/remotepin.go
+9
-11
@@ -444,13 +444,11 @@ TIP:
444
}
445
446
name := req.Arguments[0]
447
- url := req.Arguments[1]
448
- key := req.Arguments[2]
449
-
450
- endpoint, err := normalizeEndpoint(url)
447
+ endpoint, err := normalizeEndpoint(req.Arguments[1])
448
if err != nil {
449
return err
450
}
451
+ key := req.Arguments[2]
452
453
cfg, err := repo.Config()
454
if err != nil {
@@ -705,18 +703,14 @@ func getRemotePinService(env cmds.Environment, name string) (*pinclient.Client,
703
if name == "" {
704
return nil, fmt.Errorf("remote pinning service name not specified")
705
}
708
- url, key, err := getRemotePinServiceInfo(env, name)
709
- if err != nil {
710
- return nil, err
711
- }
712
- endpoint, err := normalizeEndpoint(url)
706
+ endpoint, key, err := getRemotePinServiceInfo(env, name)
707
if err != nil {
708
return nil, err
709
}
710
return pinclient.NewClient(endpoint, key), nil
711
}
712
719
-func getRemotePinServiceInfo(env cmds.Environment, name string) (url, key string, err error) {
713
+func getRemotePinServiceInfo(env cmds.Environment, name string) (endpoint, key string, err error) {
714
cfgRoot, err := cmdenv.GetConfigRoot(env)
715
if err != nil {
716
return "", "", err
@@ -737,7 +731,11 @@ func getRemotePinServiceInfo(env cmds.Environment, name string) (url, key string
731
if !present {
732
return "", "", fmt.Errorf("service not known")
733
}
740
- return service.Api.Endpoint, service.Api.Key, nil
734
+ endpoint, err = normalizeEndpoint(service.Api.Endpoint)
735
+ if err != nil {
736
+ return "", "", err
737
+ }
738
+ return endpoint, service.Api.Key, nil
739
}
740
741
func normalizeEndpoint(endpoint string) (string, error) {