Skip to content

Commit e4bc551

Browse files
committed
refactor: url → endpoint
#7828 (comment)
1 parent 253d794 commit e4bc551

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

core/commands/pin/remotepin.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,11 @@ var addRemotePinServiceCmd = &cmds.Command{
391391
}
392392

393393
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])
398395
if err != nil {
399396
return err
400397
}
398+
key := req.Arguments[2]
401399

402400
cfg, err := repo.Config()
403401
if err != nil {
@@ -640,18 +638,14 @@ func getRemotePinService(env cmds.Environment, name string) (*pinclient.Client,
640638
if name == "" {
641639
return nil, fmt.Errorf("remote pinning service name not specified")
642640
}
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)
648642
if err != nil {
649643
return nil, err
650644
}
651645
return pinclient.NewClient(endpoint, key), nil
652646
}
653647

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) {
655649
cfgRoot, err := cmdenv.GetConfigRoot(env)
656650
if err != nil {
657651
return "", "", err
@@ -672,7 +666,11 @@ func getRemotePinServiceInfo(env cmds.Environment, name string) (url, key string
672666
if !present {
673667
return "", "", fmt.Errorf("service not known")
674668
}
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
676674
}
677675

678676
func normalizeEndpoint(endpoint string) (string, error) {

0 commit comments

Comments
 (0)