Skip to content

Commit

Permalink
chore: change go module name to nydus
Browse files Browse the repository at this point in the history
Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
  • Loading branch information
Desiki-high authored and imeoer committed Dec 18, 2023
1 parent d6da88a commit 763786f
Show file tree
Hide file tree
Showing 45 changed files with 97 additions and 97 deletions.
2 changes: 1 addition & 1 deletion contrib/ctr-remote/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/containerd/containerd/cmd/ctr/app"
"github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies
"github.com/dragonflyoss/image-service/contrib/ctr-remote/commands"
"github.com/dragonflyoss/nydus/contrib/ctr-remote/commands"
"github.com/urfave/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/ctr-remote/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dragonflyoss/image-service/contrib/ctr-remote
module github.com/dragonflyoss/nydus/contrib/ctr-remote

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion contrib/nydus-overlayfs/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dragonflyoss/image-service/contrib/nydus-overlayfs
module github.com/dragonflyoss/nydus/contrib/nydus-overlayfs

go 1.20

Expand Down
18 changes: 9 additions & 9 deletions contrib/nydusify/cmd/nydusify.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/rule"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/chunkdict/generator"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/copier"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/packer"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/viewer"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/rule"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/chunkdict/generator"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/copier"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/packer"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/viewer"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/examples/converter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dragonflyoss/image-service/contrib/nydusify
module github.com/dragonflyoss/nydus/contrib/nydusify

go 1.20

Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/backend/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"fmt"
"io"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/backend/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"os"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
)
Expand Down
6 changes: 3 additions & 3 deletions contrib/nydusify/pkg/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"io"
"strconv"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
"github.com/sirupsen/logrus"

"github.com/containerd/containerd/images"
Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/stretchr/testify/assert"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

func makeRecord(id int64, hashBlob bool) *Record {
Expand Down
12 changes: 6 additions & 6 deletions contrib/nydusify/pkg/checker/checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/rule"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/rule"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

// Opt defines Checker options.
Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/checker/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

func prettyDump(obj interface{}, name string) error {
Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/checker/rule/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
)

// BootstrapRule validates bootstrap in Nydus image
Expand Down
8 changes: 4 additions & 4 deletions contrib/nydusify/pkg/checker/rule/filesystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"github.com/distribution/reference"
dockerconfig "github.com/docker/cli/cli/config"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
"github.com/pkg/errors"
"github.com/pkg/xattr"
"github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/checker/rule/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

// ManifestRule validates manifest format of Nydus image
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/checker/rule/manifest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package rule
import (
"testing"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/stretchr/testify/assert"

v1 "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
8 changes: 4 additions & 4 deletions contrib/nydusify/pkg/chunkdict/generator/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

// Opt defines Chunkdict generate options.
Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/chunkdict/generator/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

func prettyDump(obj interface{}, name string) error {
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/compactor/compactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"path/filepath"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/converter/converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"

"github.com/containerd/containerd/namespaces"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter/provider"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter/provider"
"github.com/goharbor/acceleration-service/pkg/converter"
"github.com/goharbor/acceleration-service/pkg/platformutil"
"github.com/pkg/errors"
Expand Down
10 changes: 5 additions & 5 deletions contrib/nydusify/pkg/copier/copier.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/reference/docker"
"github.com/containerd/nydus-snapshotter/pkg/converter"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter/provider"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
nydusifyUtils "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter/provider"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
nydusifyUtils "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
"github.com/dustin/go-humanize"
"github.com/goharbor/acceleration-service/pkg/errdefs"
"github.com/goharbor/acceleration-service/pkg/platformutil"
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/metrics/fileexporter/fileexporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package fileexporter
import (
"github.com/prometheus/client_golang/prometheus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/metrics"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/metrics"
)

type FileExporter struct{ name string }
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/packer/artifact.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path/filepath"
"strings"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

type Artifact struct {
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/packer/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package packer
import (
"encoding/json"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend"
)

type BackendConfig interface {
Expand Down
6 changes: 3 additions & 3 deletions contrib/nydusify/pkg/packer/packer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"path/filepath"
"strings"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/compactor"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/compactor"

"github.com/pkg/errors"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/packer/packer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"testing"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/packer/pusher.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

type Pusher struct {
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/packer/pusher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"testing"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions contrib/nydusify/pkg/parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"io"
"strings"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"

"github.com/containerd/containerd/images"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/pkg/provider/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
dockerconfig "github.com/docker/cli/cli/config"
"github.com/pkg/errors"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
)

func newDefaultClient(skipTLSVerify bool) *http.Client {
Expand Down
6 changes: 3 additions & 3 deletions contrib/nydusify/pkg/provider/source.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

// SourceLayer is a layer of source image
Expand Down
8 changes: 4 additions & 4 deletions contrib/nydusify/pkg/viewer/viewer.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
)

func prettyDump(obj interface{}, name string) error {
Expand Down
2 changes: 1 addition & 1 deletion contrib/nydusify/plugin/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/hook"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/hook"
)

type LocalHook struct {
Expand Down
2 changes: 1 addition & 1 deletion smoke/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dragonflyoss/image-service/smoke
module github.com/dragonflyoss/nydus/smoke

go 1.20

Expand Down
6 changes: 3 additions & 3 deletions smoke/tests/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/containerd/nydus-snapshotter/pkg/converter"
"github.com/stretchr/testify/require"

"github.com/dragonflyoss/image-service/smoke/tests/texture"
"github.com/dragonflyoss/image-service/smoke/tests/tool"
"github.com/dragonflyoss/image-service/smoke/tests/tool/test"
"github.com/dragonflyoss/nydus/smoke/tests/texture"
"github.com/dragonflyoss/nydus/smoke/tests/tool"
"github.com/dragonflyoss/nydus/smoke/tests/tool/test"
)

type APIV1TestSuite struct{}
Expand Down
4 changes: 2 additions & 2 deletions smoke/tests/benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"testing"
"time"

"github.com/dragonflyoss/image-service/smoke/tests/tool"
"github.com/dragonflyoss/image-service/smoke/tests/tool/test"
"github.com/dragonflyoss/nydus/smoke/tests/tool"
"github.com/dragonflyoss/nydus/smoke/tests/tool/test"
"github.com/google/uuid"
)

Expand Down
Loading

0 comments on commit 763786f

Please sign in to comment.