Skip to content

Commit 0df0d8f

Browse files
hacdiashacdias
committed
fix: honour --ttl flag in 'ipfs name publish'
1 parent 7c744a2 commit 0df0d8f

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

‎core/coreapi/name.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
ipath "github.com/ipfs/go-path"
1616
coreiface "github.com/ipfs/interface-go-ipfs-core"
1717
caopts "github.com/ipfs/interface-go-ipfs-core/options"
18+
nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
1819
path "github.com/ipfs/interface-go-ipfs-core/path"
1920
ci "github.com/libp2p/go-libp2p/core/crypto"
2021
peer "github.com/libp2p/go-libp2p/core/peer"
@@ -37,8 +38,6 @@ func (e *ipnsEntry) Value() path.Path {
3738
return e.value
3839
}
3940

40-
type requestContextKey string
41-
4241
// Publish announces new IPNS name and returns the new IPNS entry.
4342
func (api *NameAPI) Publish(ctx context.Context, p path.Path, opts ...caopts.NamePublishOption) (coreiface.IpnsEntry, error) {
4443
ctx, span := tracing.Span(ctx, "CoreAPI.NameAPI", "Publish", trace.WithAttributes(attribute.String("path", p.String())))
@@ -76,13 +75,17 @@ func (api *NameAPI) Publish(ctx context.Context, p path.Path, opts ...caopts.Nam
7675
return nil, err
7776
}
7877

78+
eol := time.Now().Add(options.ValidTime)
79+
80+
publishOptions := []nsopts.PublishOption{
81+
nsopts.PublishWithEOL(eol),
82+
}
83+
7984
if options.TTL != nil {
80-
// nolint: staticcheck // non-backward compatible change
81-
ctx = context.WithValue(ctx, requestContextKey("ipns-publish-ttl"), *options.TTL)
85+
publishOptions = append(publishOptions, nsopts.PublishWithTTL(*options.TTL))
8286
}
8387

84-
eol := time.Now().Add(options.ValidTime)
85-
err = api.namesys.PublishWithEOL(ctx, k, pth, eol)
88+
err = api.namesys.Publish(ctx, k, pth, publishOptions...)
8689
if err != nil {
8790
return nil, err
8891
}

‎core/corehttp/gateway_test.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"regexp"
1010
"strings"
1111
"testing"
12-
"time"
1312

1413
namesys "github.com/ipfs/go-namesys"
1514
version "github.com/ipfs/kubo"
@@ -68,11 +67,7 @@ func (m mockNamesys) ResolveAsync(ctx context.Context, name string, opts ...nsop
6867
return out
6968
}
7069

71-
func (m mockNamesys) Publish(ctx context.Context, name ci.PrivKey, value path.Path) error {
72-
return errors.New("not implemented for mockNamesys")
73-
}
74-
75-
func (m mockNamesys) PublishWithEOL(ctx context.Context, name ci.PrivKey, value path.Path, _ time.Time) error {
70+
func (m mockNamesys) Publish(ctx context.Context, name ci.PrivKey, value path.Path, opts ...nsopts.PublishOption) error {
7671
return errors.New("not implemented for mockNamesys")
7772
}
7873

‎docs/examples/kubo-as-a-library/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ replace github.com/ipfs/kubo => ./../../..
88

99
require (
1010
github.com/ipfs/go-ipfs-files v0.2.0
11-
github.com/ipfs/interface-go-ipfs-core v0.8.1
11+
github.com/ipfs/interface-go-ipfs-core v0.8.2-0.20221213102858-77d51fc050db
1212
github.com/ipfs/kubo v0.14.0-rc1
1313
github.com/libp2p/go-libp2p v0.24.2
1414
github.com/multiformats/go-multiaddr v0.8.0
@@ -102,7 +102,7 @@ require (
102102
github.com/ipfs/go-merkledag v0.8.1 // indirect
103103
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
104104
github.com/ipfs/go-mfs v0.2.1 // indirect
105-
github.com/ipfs/go-namesys v0.6.0 // indirect
105+
github.com/ipfs/go-namesys v0.6.1-0.20221212115758-6b648ff31901 // indirect
106106
github.com/ipfs/go-path v0.3.0 // indirect
107107
github.com/ipfs/go-peertaskqueue v0.8.0 // indirect
108108
github.com/ipfs/go-unixfs v0.4.1 // indirect

‎docs/examples/kubo-as-a-library/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,8 @@ github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fG
579579
github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY=
580580
github.com/ipfs/go-mfs v0.2.1 h1:5jz8+ukAg/z6jTkollzxGzhkl3yxm022Za9f2nL5ab8=
581581
github.com/ipfs/go-mfs v0.2.1/go.mod h1:Woj80iuw4ajDnIP6+seRaoHpPsc9hmL0pk/nDNDWP88=
582-
github.com/ipfs/go-namesys v0.6.0 h1:w4+Wq9bCILnuZRT1RBBdzZQFqtJeDG1duzN8mIDnHZ0=
583-
github.com/ipfs/go-namesys v0.6.0/go.mod h1:0L+3CHBgHxr08Cg+chVo9Ew285PGQfToThjll4g0/d4=
582+
github.com/ipfs/go-namesys v0.6.1-0.20221212115758-6b648ff31901 h1:nK/gmRqL/8dxp4xwu/1F8ErJciiiv9XxTWtsfIPv5i4=
583+
github.com/ipfs/go-namesys v0.6.1-0.20221212115758-6b648ff31901/go.mod h1:eRSVJHtD3ELCGpdbrCCxKXvTO/lAuJ/aegjyWn88vTg=
584584
github.com/ipfs/go-path v0.2.1/go.mod h1:NOScsVgxfC/eIw4nz6OiGwK42PjaSJ4Y/ZFPn1Xe07I=
585585
github.com/ipfs/go-path v0.3.0 h1:tkjga3MtpXyM5v+3EbRvOHEoo+frwi4oumw5K+KYWyA=
586586
github.com/ipfs/go-path v0.3.0/go.mod h1:NOScsVgxfC/eIw4nz6OiGwK42PjaSJ4Y/ZFPn1Xe07I=
@@ -598,8 +598,8 @@ github.com/ipfs/go-unixfsnode v1.4.0/go.mod h1:qc7YFFZ8tABc58p62HnIYbUMwj9chhUuF
598598
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
599599
github.com/ipfs/go-verifcid v0.0.2 h1:XPnUv0XmdH+ZIhLGKg6U2vaPaRDXb9urMyNVCE7uvTs=
600600
github.com/ipfs/go-verifcid v0.0.2/go.mod h1:40cD9x1y4OWnFXbLNJYRe7MpNvWlMn3LZAG5Wb4xnPU=
601-
github.com/ipfs/interface-go-ipfs-core v0.8.1 h1:nuFG0YJ429Wd5gtRb3ivlblpknZ5VfDVKZkmOG2TnNQ=
602-
github.com/ipfs/interface-go-ipfs-core v0.8.1/go.mod h1:WYC2H6Mu7aGqhlupi/CVawcs0X1Me4uRvV0rcTlo3zM=
601+
github.com/ipfs/interface-go-ipfs-core v0.8.2-0.20221213102858-77d51fc050db h1:oD5Hqo0LY2ahLzvet36P1lJkxE64lT2ItAP9mnjNmBs=
602+
github.com/ipfs/interface-go-ipfs-core v0.8.2-0.20221213102858-77d51fc050db/go.mod h1:WYC2H6Mu7aGqhlupi/CVawcs0X1Me4uRvV0rcTlo3zM=
603603
github.com/ipld/edelweiss v0.2.0 h1:KfAZBP8eeJtrLxLhi7r3N0cBCo7JmwSRhOJp3WSpNjk=
604604
github.com/ipld/edelweiss v0.2.0/go.mod h1:FJAzJRCep4iI8FOFlRriN9n0b7OuX3T/S9++NpBDmA4=
605605
github.com/ipld/go-car v0.4.0 h1:U6W7F1aKF/OJMHovnOVdst2cpQE5GhmHibQkAixgNcQ=

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ require (
1515
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5
1616
github.com/fsnotify/fsnotify v1.6.0
1717
github.com/gabriel-vasile/mimetype v1.4.1
18+
github.com/gogo/protobuf v1.3.2
1819
github.com/google/uuid v1.3.0
1920
github.com/hashicorp/go-multierror v1.1.1
2021
github.com/ipfs/go-bitswap v0.11.0
@@ -57,13 +58,13 @@ require (
5758
github.com/ipfs/go-metrics-interface v0.0.1
5859
github.com/ipfs/go-metrics-prometheus v0.0.2
5960
github.com/ipfs/go-mfs v0.2.1
60-
github.com/ipfs/go-namesys v0.6.0
61+
github.com/ipfs/go-namesys v0.6.1-0.20221212115758-6b648ff31901
6162
github.com/ipfs/go-path v0.3.0
6263
github.com/ipfs/go-pinning-service-http-client v0.1.2
6364
github.com/ipfs/go-unixfs v0.4.1
6465
github.com/ipfs/go-unixfsnode v1.4.0
6566
github.com/ipfs/go-verifcid v0.0.2
66-
github.com/ipfs/interface-go-ipfs-core v0.8.1
67+
github.com/ipfs/interface-go-ipfs-core v0.8.2-0.20221213102858-77d51fc050db
6768
github.com/ipld/go-car v0.4.0
6869
github.com/ipld/go-car/v2 v2.4.0
6970
github.com/ipld/go-codec-dagpb v1.4.1
@@ -144,7 +145,6 @@ require (
144145
github.com/go-logr/stdr v1.2.2 // indirect
145146
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
146147
github.com/godbus/dbus/v5 v5.1.0 // indirect
147-
github.com/gogo/protobuf v1.3.2 // indirect
148148
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
149149
github.com/golang/mock v1.6.0 // indirect
150150
github.com/golang/protobuf v1.5.2 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@ github.com/ipfs/go-metrics-prometheus v0.0.2 h1:9i2iljLg12S78OhC6UAiXi176xvQGiZa
604604
github.com/ipfs/go-metrics-prometheus v0.0.2/go.mod h1:ELLU99AQQNi+zX6GCGm2lAgnzdSH3u5UVlCdqSXnEks=
605605
github.com/ipfs/go-mfs v0.2.1 h1:5jz8+ukAg/z6jTkollzxGzhkl3yxm022Za9f2nL5ab8=
606606
github.com/ipfs/go-mfs v0.2.1/go.mod h1:Woj80iuw4ajDnIP6+seRaoHpPsc9hmL0pk/nDNDWP88=
607-
github.com/ipfs/go-namesys v0.6.0 h1:w4+Wq9bCILnuZRT1RBBdzZQFqtJeDG1duzN8mIDnHZ0=
608-
github.com/ipfs/go-namesys v0.6.0/go.mod h1:0L+3CHBgHxr08Cg+chVo9Ew285PGQfToThjll4g0/d4=
607+
github.com/ipfs/go-namesys v0.6.1-0.20221212115758-6b648ff31901 h1:nK/gmRqL/8dxp4xwu/1F8ErJciiiv9XxTWtsfIPv5i4=
608+
github.com/ipfs/go-namesys v0.6.1-0.20221212115758-6b648ff31901/go.mod h1:eRSVJHtD3ELCGpdbrCCxKXvTO/lAuJ/aegjyWn88vTg=
609609
github.com/ipfs/go-path v0.2.1/go.mod h1:NOScsVgxfC/eIw4nz6OiGwK42PjaSJ4Y/ZFPn1Xe07I=
610610
github.com/ipfs/go-path v0.3.0 h1:tkjga3MtpXyM5v+3EbRvOHEoo+frwi4oumw5K+KYWyA=
611611
github.com/ipfs/go-path v0.3.0/go.mod h1:NOScsVgxfC/eIw4nz6OiGwK42PjaSJ4Y/ZFPn1Xe07I=
@@ -625,8 +625,8 @@ github.com/ipfs/go-unixfsnode v1.4.0/go.mod h1:qc7YFFZ8tABc58p62HnIYbUMwj9chhUuF
625625
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
626626
github.com/ipfs/go-verifcid v0.0.2 h1:XPnUv0XmdH+ZIhLGKg6U2vaPaRDXb9urMyNVCE7uvTs=
627627
github.com/ipfs/go-verifcid v0.0.2/go.mod h1:40cD9x1y4OWnFXbLNJYRe7MpNvWlMn3LZAG5Wb4xnPU=
628-
github.com/ipfs/interface-go-ipfs-core v0.8.1 h1:nuFG0YJ429Wd5gtRb3ivlblpknZ5VfDVKZkmOG2TnNQ=
629-
github.com/ipfs/interface-go-ipfs-core v0.8.1/go.mod h1:WYC2H6Mu7aGqhlupi/CVawcs0X1Me4uRvV0rcTlo3zM=
628+
github.com/ipfs/interface-go-ipfs-core v0.8.2-0.20221213102858-77d51fc050db h1:oD5Hqo0LY2ahLzvet36P1lJkxE64lT2ItAP9mnjNmBs=
629+
github.com/ipfs/interface-go-ipfs-core v0.8.2-0.20221213102858-77d51fc050db/go.mod h1:WYC2H6Mu7aGqhlupi/CVawcs0X1Me4uRvV0rcTlo3zM=
630630
github.com/ipld/edelweiss v0.2.0 h1:KfAZBP8eeJtrLxLhi7r3N0cBCo7JmwSRhOJp3WSpNjk=
631631
github.com/ipld/edelweiss v0.2.0/go.mod h1:FJAzJRCep4iI8FOFlRriN9n0b7OuX3T/S9++NpBDmA4=
632632
github.com/ipld/go-car v0.4.0 h1:U6W7F1aKF/OJMHovnOVdst2cpQE5GhmHibQkAixgNcQ=

0 commit comments

Comments
 (0)