Skip to content

Commit d82dec3

Browse files
lidellidel
authored
Merge pull request #8958 from ipfs/chore/rename-to-kubo
refactor: rename to kubo see: #8959
2 parents 289e465 + 3417ed4 commit d82dec3

File tree

199 files changed

+603
-580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+603
-580
lines changed

‎.circleci/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ jobs:
119119
cp go.sum go.sum.bak
120120
121121
# make sure the examples run against the current version of go-ipfs
122-
go mod edit -replace github.com/ipfs/go-ipfs=./../../..
122+
go mod edit -replace github.com/ipfs/kubo=./../../..
123123
go mod tidy
124124
125125
# use the internal config package when we test the current version of go-ipfs
126-
sed -i.bak 's;"github.com/ipfs/go-ipfs-config";"github.com/ipfs/go-ipfs/config";' ./main.go
126+
sed -i.bak 's;"github.com/ipfs/go-ipfs-config";"github.com/ipfs/kubo/config";' ./main.go
127127
128128
go test -v ./...
129129

‎.github/workflows/docker-image.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ on:
1111

1212
jobs:
1313
push_to_registry:
14-
if: github.repository == 'ipfs/go-ipfs' || github.event_name == 'workflow_dispatch'
14+
if: github.repository == 'ipfs/go-ipfs' || github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
1515
name: Push Docker image to Docker Hub
1616
runs-on: ubuntu-latest
1717
env:
18-
IMAGE_NAME: ipfs/go-ipfs
18+
IMAGE_NAME: ipfs/kubo
19+
LEGACY_IMAGE_NAME: ipfs/go-ipfs
1920
steps:
2021
- name: Check out the repo
2122
uses: actions/checkout@v2

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y \
88
ca-certificates \
99
fuse
1010

11-
ENV SRC_DIR /go-ipfs
11+
ENV SRC_DIR /kubo
1212

1313
# Download packages first so they can be cached.
1414
COPY go.mod go.sum $SRC_DIR/
@@ -51,7 +51,7 @@ FROM busybox:1.31.1-glibc
5151
LABEL maintainer="Steven Allen <[email protected]>"
5252

5353
# Get the ipfs binary, entrypoint script, and TLS CAs from the build container.
54-
ENV SRC_DIR /go-ipfs
54+
ENV SRC_DIR /kubo
5555
COPY --from=0 $SRC_DIR/cmd/ipfs/ipfs /usr/local/bin/ipfs
5656
COPY --from=0 $SRC_DIR/bin/container_daemon /usr/local/bin/start_ipfs
5757
COPY --from=0 $SRC_DIR/bin/container_init_run /usr/local/bin/container_init_run

‎README.md

Lines changed: 106 additions & 87 deletions
Large diffs are not rendered by default.

‎assets/assets.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
gopath "path"
1010
"strconv"
1111

12-
"github.com/ipfs/go-ipfs/core"
13-
"github.com/ipfs/go-ipfs/core/coreapi"
12+
"github.com/ipfs/kubo/core"
13+
"github.com/ipfs/kubo/core/coreapi"
1414

1515
"github.com/cespare/xxhash"
1616
cid "github.com/ipfs/go-cid"

‎bin/get-docker-tags.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@ BUILD_NUM=$1
2929
GIT_SHA1=${2:-$(git rev-parse HEAD)}
3030
GIT_SHA1_SHORT=$(echo "$GIT_SHA1" | cut -c 1-7)
3131
GIT_BRANCH=${3:-$(git symbolic-ref -q --short HEAD || echo "unknown")}
32-
GIT_TAG=${4:-$(git describe --tags --exact-match || echo "")}
32+
GIT_TAG=${4:-$(git describe --tags --exact-match 2> /dev/null || echo "")}
3333

34-
IMAGE_NAME=${IMAGE_NAME:-ipfs/go-ipfs}
34+
IMAGE_NAME=${IMAGE_NAME:-ipfs/kubo}
35+
LEGACY_IMAGE_NAME=${LEGACY_IMAGE_NAME:-ipfs/go-ipfs}
3536

3637
echoImageName () {
3738
local IMAGE_TAG=$1
3839
echo "$IMAGE_NAME:$IMAGE_TAG"
40+
echo "$LEGACY_IMAGE_NAME:$IMAGE_TAG"
3941
}
4042

4143
if [[ $GIT_TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+-rc ]]; then

‎cmd/ipfs/Rules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PATH := $(realpath $(d)):$(PATH)
1313
# DEPS_OO_$(d) += merkledag/pb/merkledag.pb.go namesys/pb/namesys.pb.go
1414
# DEPS_OO_$(d) += pin/internal/pb/header.pb.go unixfs/pb/unixfs.pb.go
1515

16-
$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs".CurrentCommit=$(git-hash)"
16+
$(d)_flags =-ldflags="-X "github.com/ipfs/kubo".CurrentCommit=$(git-hash)"
1717

1818
$(d)-try-build $(IPFS_BIN_$(d)): GOFLAGS += $(cmd/ipfs_flags)
1919

@@ -42,7 +42,7 @@ CLEAN += $(COVER_BIN_$(d))
4242

4343
$(COVER_BIN_$(d)): GOTAGS += testrunmain
4444
$(COVER_BIN_$(d)): $(d) $$(DEPS_GO) ALWAYS
45-
$(eval TMP_PKGS := $(shell $(GOCC) list -f '{{range .Deps}}{{.}} {{end}}' $(go-flags-with-tags) ./cmd/ipfs | sed 's/ /\n/g' | grep ipfs/go-ipfs) $(call go-pkg-name,$<))
45+
$(eval TMP_PKGS := $(shell $(GOCC) list -f '{{range .Deps}}{{.}} {{end}}' $(go-flags-with-tags) ./cmd/ipfs | sed 's/ /\n/g' | grep ipfs/kubo) $(call go-pkg-name,$<))
4646
$(eval TMP_LIST := $(call join-with,$(comma),$(TMP_PKGS)))
4747
@echo $(GOCC) test $@ -c -covermode atomic -coverpkg ... $(go-flags-with-tags) ./$(@D) # for info
4848
@$(GOCC) test -o $@ -c -covermode atomic -coverpkg $(TMP_LIST) $(go-flags-with-tags) ./$(@D) 2>&1 | (grep -v 'warning: no packages being tested' || true)

‎cmd/ipfs/add_migrations.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"path/filepath"
1010

1111
files "github.com/ipfs/go-ipfs-files"
12-
"github.com/ipfs/go-ipfs/core"
13-
"github.com/ipfs/go-ipfs/core/coreapi"
14-
"github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
15-
"github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher"
1612
coreiface "github.com/ipfs/interface-go-ipfs-core"
1713
"github.com/ipfs/interface-go-ipfs-core/options"
1814
ipath "github.com/ipfs/interface-go-ipfs-core/path"
15+
"github.com/ipfs/kubo/core"
16+
"github.com/ipfs/kubo/core/coreapi"
17+
"github.com/ipfs/kubo/repo/fsrepo/migrations"
18+
"github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher"
1919
"github.com/libp2p/go-libp2p-core/peer"
2020
)
2121

@@ -36,7 +36,7 @@ func addMigrations(ctx context.Context, node *core.IpfsNode, fetcher migrations.
3636
if err != nil {
3737
return err
3838
}
39-
case *migrations.HttpFetcher, *migrations.RetryFetcher: // https://github.com/ipfs/go-ipfs/issues/8780
39+
case *migrations.HttpFetcher, *migrations.RetryFetcher: // https://github.com/ipfs/kubo/issues/8780
4040
// Add the downloaded migration files directly
4141
if migrations.DownloadDirectory != "" {
4242
var paths []string

‎cmd/ipfs/daemon.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ import (
1515

1616
multierror "github.com/hashicorp/go-multierror"
1717

18-
version "github.com/ipfs/go-ipfs"
19-
utilmain "github.com/ipfs/go-ipfs/cmd/ipfs/util"
20-
oldcmds "github.com/ipfs/go-ipfs/commands"
21-
config "github.com/ipfs/go-ipfs/config"
22-
cserial "github.com/ipfs/go-ipfs/config/serialize"
23-
"github.com/ipfs/go-ipfs/core"
24-
commands "github.com/ipfs/go-ipfs/core/commands"
25-
"github.com/ipfs/go-ipfs/core/coreapi"
26-
corehttp "github.com/ipfs/go-ipfs/core/corehttp"
27-
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
28-
libp2p "github.com/ipfs/go-ipfs/core/node/libp2p"
29-
nodeMount "github.com/ipfs/go-ipfs/fuse/node"
30-
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
31-
"github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
32-
"github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher"
18+
version "github.com/ipfs/kubo"
19+
utilmain "github.com/ipfs/kubo/cmd/ipfs/util"
20+
oldcmds "github.com/ipfs/kubo/commands"
21+
config "github.com/ipfs/kubo/config"
22+
cserial "github.com/ipfs/kubo/config/serialize"
23+
"github.com/ipfs/kubo/core"
24+
commands "github.com/ipfs/kubo/core/commands"
25+
"github.com/ipfs/kubo/core/coreapi"
26+
corehttp "github.com/ipfs/kubo/core/corehttp"
27+
corerepo "github.com/ipfs/kubo/core/corerepo"
28+
libp2p "github.com/ipfs/kubo/core/node/libp2p"
29+
nodeMount "github.com/ipfs/kubo/fuse/node"
30+
fsrepo "github.com/ipfs/kubo/repo/fsrepo"
31+
"github.com/ipfs/kubo/repo/fsrepo/migrations"
32+
"github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher"
3333
sockets "github.com/libp2p/go-socket-activation"
3434

3535
cmds "github.com/ipfs/go-ipfs-cmds"
@@ -801,7 +801,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, e
801801
}
802802

803803
if len(cfg.Gateway.PathPrefixes) > 0 {
804-
log.Error("Support for X-Ipfs-Gateway-Prefix and Gateway.PathPrefixes is deprecated and will be removed in the next release. Please comment on the issue if you're using this feature: https://github.com/ipfs/go-ipfs/issues/7702")
804+
log.Error("Support for X-Ipfs-Gateway-Prefix and Gateway.PathPrefixes is deprecated and will be removed in the next release. Please comment on the issue if you're using this feature: https://github.com/ipfs/kubo/issues/7702")
805805
}
806806

807807
node, err := cctx.ConstructNode()

‎cmd/ipfs/debug.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"net/http"
55

6-
"github.com/ipfs/go-ipfs/profile"
6+
"github.com/ipfs/kubo/profile"
77
)
88

99
func init() {

‎cmd/ipfs/init.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ import (
1010
"path/filepath"
1111
"strings"
1212

13-
assets "github.com/ipfs/go-ipfs/assets"
14-
oldcmds "github.com/ipfs/go-ipfs/commands"
15-
core "github.com/ipfs/go-ipfs/core"
16-
"github.com/ipfs/go-ipfs/core/commands"
17-
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
1813
path "github.com/ipfs/go-path"
1914
unixfs "github.com/ipfs/go-unixfs"
15+
assets "github.com/ipfs/kubo/assets"
16+
oldcmds "github.com/ipfs/kubo/commands"
17+
core "github.com/ipfs/kubo/core"
18+
"github.com/ipfs/kubo/core/commands"
19+
fsrepo "github.com/ipfs/kubo/repo/fsrepo"
2020

2121
cmds "github.com/ipfs/go-ipfs-cmds"
2222
files "github.com/ipfs/go-ipfs-files"
23-
config "github.com/ipfs/go-ipfs/config"
2423
options "github.com/ipfs/interface-go-ipfs-core/options"
24+
config "github.com/ipfs/kubo/config"
2525
)
2626

2727
const (

‎cmd/ipfs/ipfs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
commands "github.com/ipfs/go-ipfs/core/commands"
4+
commands "github.com/ipfs/kubo/core/commands"
55

66
cmds "github.com/ipfs/go-ipfs-cmds"
77
)

‎cmd/ipfs/main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import (
1212
"runtime/pprof"
1313
"time"
1414

15-
util "github.com/ipfs/go-ipfs/cmd/ipfs/util"
16-
oldcmds "github.com/ipfs/go-ipfs/commands"
17-
core "github.com/ipfs/go-ipfs/core"
18-
corecmds "github.com/ipfs/go-ipfs/core/commands"
19-
corehttp "github.com/ipfs/go-ipfs/core/corehttp"
20-
loader "github.com/ipfs/go-ipfs/plugin/loader"
21-
repo "github.com/ipfs/go-ipfs/repo"
22-
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
23-
"github.com/ipfs/go-ipfs/tracing"
15+
util "github.com/ipfs/kubo/cmd/ipfs/util"
16+
oldcmds "github.com/ipfs/kubo/commands"
17+
core "github.com/ipfs/kubo/core"
18+
corecmds "github.com/ipfs/kubo/core/commands"
19+
corehttp "github.com/ipfs/kubo/core/corehttp"
20+
loader "github.com/ipfs/kubo/plugin/loader"
21+
repo "github.com/ipfs/kubo/repo"
22+
fsrepo "github.com/ipfs/kubo/repo/fsrepo"
23+
"github.com/ipfs/kubo/tracing"
2424
"go.opentelemetry.io/otel"
2525

2626
cmds "github.com/ipfs/go-ipfs-cmds"

‎cmd/ipfs/pinmfs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
logging "github.com/ipfs/go-log"
1414
pinclient "github.com/ipfs/go-pinning-service-http-client"
1515

16-
config "github.com/ipfs/go-ipfs/config"
17-
"github.com/ipfs/go-ipfs/core"
16+
config "github.com/ipfs/kubo/config"
17+
"github.com/ipfs/kubo/core"
1818
)
1919

2020
// mfslog is the logger for remote mfs pinning

‎cmd/ipfs/pinmfs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"testing"
88
"time"
99

10-
config "github.com/ipfs/go-ipfs/config"
1110
ipld "github.com/ipfs/go-ipld-format"
1211
merkledag "github.com/ipfs/go-merkledag"
12+
config "github.com/ipfs/kubo/config"
1313
"github.com/libp2p/go-libp2p-core/host"
1414
peer "github.com/libp2p/go-libp2p-core/peer"
1515
)

‎cmd/ipfswatch/ipfswatch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package main
66
import (
77
"testing"
88

9-
"github.com/ipfs/go-ipfs/thirdparty/assert"
9+
"github.com/ipfs/kubo/thirdparty/assert"
1010
)
1111

1212
func TestIsHidden(t *testing.T) {

‎cmd/ipfswatch/main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"path/filepath"
1313
"syscall"
1414

15-
commands "github.com/ipfs/go-ipfs/commands"
16-
core "github.com/ipfs/go-ipfs/core"
17-
coreapi "github.com/ipfs/go-ipfs/core/coreapi"
18-
corehttp "github.com/ipfs/go-ipfs/core/corehttp"
19-
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
15+
commands "github.com/ipfs/kubo/commands"
16+
core "github.com/ipfs/kubo/core"
17+
coreapi "github.com/ipfs/kubo/core/coreapi"
18+
corehttp "github.com/ipfs/kubo/core/corehttp"
19+
fsrepo "github.com/ipfs/kubo/repo/fsrepo"
2020

2121
fsnotify "github.com/fsnotify/fsnotify"
2222
files "github.com/ipfs/go-ipfs-files"

‎commands/context.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import (
66
"strings"
77
"time"
88

9-
core "github.com/ipfs/go-ipfs/core"
10-
coreapi "github.com/ipfs/go-ipfs/core/coreapi"
11-
loader "github.com/ipfs/go-ipfs/plugin/loader"
9+
core "github.com/ipfs/kubo/core"
10+
coreapi "github.com/ipfs/kubo/core/coreapi"
11+
loader "github.com/ipfs/kubo/plugin/loader"
1212

1313
cmds "github.com/ipfs/go-ipfs-cmds"
14-
config "github.com/ipfs/go-ipfs/config"
1514
logging "github.com/ipfs/go-log"
1615
coreiface "github.com/ipfs/interface-go-ipfs-core"
1716
options "github.com/ipfs/interface-go-ipfs-core/options"
17+
config "github.com/ipfs/kubo/config"
1818
)
1919

2020
var log = logging.Logger("command")

‎config/experiments.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package config
33
type Experiments struct {
44
FilestoreEnabled bool
55
UrlstoreEnabled bool
6-
ShardingEnabled bool `json:",omitempty"` // deprecated by autosharding: https://github.com/ipfs/go-ipfs/pull/8527
6+
ShardingEnabled bool `json:",omitempty"` // deprecated by autosharding: https://github.com/ipfs/kubo/pull/8527
77
GraphsyncEnabled bool
88
Libp2pStreamMounting bool
99
P2pHttpProxy bool

‎config/gateway.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type Gateway struct {
6161
// Setting to 0 will enable fast listings for all directories.
6262
FastDirIndexThreshold *OptionalInteger `json:",omitempty"`
6363

64-
// FIXME: Not yet implemented: https://github.com/ipfs/go-ipfs/issues/8059
64+
// FIXME: Not yet implemented: https://github.com/ipfs/kubo/issues/8059
6565
APICommands []string
6666

6767
// NoFetch configures the gateway to _not_ fetch blocks in response to

‎config/serialize/serialize.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"path/filepath"
1010

11-
"github.com/ipfs/go-ipfs/config"
11+
"github.com/ipfs/kubo/config"
1212

1313
"github.com/facebookgo/atomicfile"
1414
)

‎config/serialize/serialize_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"runtime"
66
"testing"
77

8-
config "github.com/ipfs/go-ipfs/config"
8+
config "github.com/ipfs/kubo/config"
99
)
1010

1111
func TestConfig(t *testing.T) {

‎core/builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/ipfs/go-ipfs/core/bootstrap"
11-
"github.com/ipfs/go-ipfs/core/node"
10+
"github.com/ipfs/kubo/core/bootstrap"
11+
"github.com/ipfs/kubo/core/node"
1212

1313
"github.com/ipfs/go-metrics-interface"
1414
"go.uber.org/dig"

‎core/commands/active.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/tabwriter"
88
"time"
99

10-
oldcmds "github.com/ipfs/go-ipfs/commands"
10+
oldcmds "github.com/ipfs/kubo/commands"
1111

1212
cmds "github.com/ipfs/go-ipfs-cmds"
1313
)

‎core/commands/add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path"
99
"strings"
1010

11-
"github.com/ipfs/go-ipfs/core/commands/cmdenv"
11+
"github.com/ipfs/kubo/core/commands/cmdenv"
1212

1313
"github.com/cheggaaa/pb"
1414
cmds "github.com/ipfs/go-ipfs-cmds"

‎core/commands/bitswap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"io"
66

7-
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
8-
e "github.com/ipfs/go-ipfs/core/commands/e"
7+
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
8+
e "github.com/ipfs/kubo/core/commands/e"
99

1010
humanize "github.com/dustin/go-humanize"
1111
bitswap "github.com/ipfs/go-bitswap"

‎core/commands/block.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
files "github.com/ipfs/go-ipfs-files"
1010

11-
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
12-
"github.com/ipfs/go-ipfs/core/commands/cmdutils"
11+
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12+
"github.com/ipfs/kubo/core/commands/cmdutils"
1313

1414
cmds "github.com/ipfs/go-ipfs-cmds"
1515
options "github.com/ipfs/interface-go-ipfs-core/options"

0 commit comments

Comments
 (0)