@@ -391,13 +391,11 @@ var addRemotePinServiceCmd = &cmds.Command{
391
391
}
392
392
393
393
name := req .Arguments [0 ]
394
- url := req .Arguments [1 ]
395
- key := req .Arguments [2 ]
396
-
397
- endpoint , err := normalizeEndpoint (url )
394
+ endpoint , err := normalizeEndpoint (req .Arguments [1 ])
398
395
if err != nil {
399
396
return err
400
397
}
398
+ key := req .Arguments [2 ]
401
399
402
400
cfg , err := repo .Config ()
403
401
if err != nil {
@@ -640,18 +638,14 @@ func getRemotePinService(env cmds.Environment, name string) (*pinclient.Client,
640
638
if name == "" {
641
639
return nil , fmt .Errorf ("remote pinning service name not specified" )
642
640
}
643
- url , key , err := getRemotePinServiceInfo (env , name )
644
- if err != nil {
645
- return nil , err
646
- }
647
- endpoint , err := normalizeEndpoint (url )
641
+ endpoint , key , err := getRemotePinServiceInfo (env , name )
648
642
if err != nil {
649
643
return nil , err
650
644
}
651
645
return pinclient .NewClient (endpoint , key ), nil
652
646
}
653
647
654
- func getRemotePinServiceInfo (env cmds.Environment , name string ) (url , key string , err error ) {
648
+ func getRemotePinServiceInfo (env cmds.Environment , name string ) (endpoint , key string , err error ) {
655
649
cfgRoot , err := cmdenv .GetConfigRoot (env )
656
650
if err != nil {
657
651
return "" , "" , err
@@ -672,7 +666,11 @@ func getRemotePinServiceInfo(env cmds.Environment, name string) (url, key string
672
666
if ! present {
673
667
return "" , "" , fmt .Errorf ("service not known" )
674
668
}
675
- return service .Api .Endpoint , service .Api .Key , nil
669
+ endpoint , err = normalizeEndpoint (service .Api .Endpoint )
670
+ if err != nil {
671
+ return "" , "" , err
672
+ }
673
+ return endpoint , service .Api .Key , nil
676
674
}
677
675
678
676
func normalizeEndpoint (endpoint string ) (string , error ) {
0 commit comments