mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: move pkg/ to internal/

Browse Source 
The internal/ directory in Go has a special meaning, and indicates that
those packages are not meant for external consumption. Ceph-CSI does
provide public APIs for other projects to consume. There is no plan to
keep the API of the internally used packages stable.

Closes: #903
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-04-17 11:23:49 +02:00 committed by mergify[bot]
parent d0abc3f5e6
commit 32839948ef
64 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -29,9 +29,9 @@ GO_PROJECT=github.com/ceph/ceph-csi
# go build flags # go build flags
LDFLAGS ?= LDFLAGS ?=
LDFLAGS += -X $(GO_PROJECT)/pkg/util.GitCommit=$(GIT_COMMIT) LDFLAGS += -X $(GO_PROJECT)/internal/util.GitCommit=$(GIT_COMMIT)
# CSI_IMAGE_VERSION will be considered as the driver version # CSI_IMAGE_VERSION will be considered as the driver version
LDFLAGS += -X $(GO_PROJECT)/pkg/util.DriverVersion=$(CSI_IMAGE_VERSION) LDFLAGS += -X $(GO_PROJECT)/internal/util.DriverVersion=$(CSI_IMAGE_VERSION)
# set GOARCH explicitly for cross building, default to native architecture # set GOARCH explicitly for cross building, default to native architecture
ifndef GOARCH ifndef GOARCH

8
cmd/cephcsi.go
View File

@ -24,10 +24,10 @@ import (
"runtime" "runtime"
"time" "time"
"github.com/ceph/ceph-csi/pkg/cephfs" "github.com/ceph/ceph-csi/internal/cephfs"
"github.com/ceph/ceph-csi/pkg/liveness" "github.com/ceph/ceph-csi/internal/liveness"
"github.com/ceph/ceph-csi/pkg/rbd" "github.com/ceph/ceph-csi/internal/rbd"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"k8s.io/klog" "k8s.io/klog"
) )

2
docs/coding.md
View File

@ -40,7 +40,7 @@ import (
"github.com/pborman/uuid" "github.com/pborman/uuid"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
) )
``` ```

2
pkg/cephfs/cephfs_util.go → internal/cephfs/cephfs_util.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
) )
// MDSMap is a representation of the mds map sub-structure returned by 'ceph fs get' // MDSMap is a representation of the mds map sub-structure returned by 'ceph fs get'

2
pkg/cephfs/cephuser.go → internal/cephfs/cephuser.go
View File

@ -19,7 +19,7 @@ package cephfs
import ( import (
"context" "context"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
) )
const ( const (

4
pkg/cephfs/controllerserver.go → internal/cephfs/controllerserver.go
View File

@ -19,8 +19,8 @@ package cephfs
import ( import (
"context" "context"
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

4
pkg/cephfs/driver.go → internal/cephfs/driver.go
View File

@ -19,8 +19,8 @@ package cephfs
import ( import (
"k8s.io/klog" "k8s.io/klog"
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
) )

0
pkg/cephfs/errors.go → internal/cephfs/errors.go
View File

2
pkg/cephfs/fsjournal.go → internal/cephfs/fsjournal.go
View File

@ -19,7 +19,7 @@ package cephfs
import ( import (
"context" "context"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"k8s.io/klog" "k8s.io/klog"
) )

2
pkg/cephfs/identityserver.go → internal/cephfs/identityserver.go
View File

@ -19,7 +19,7 @@ package cephfs
import ( import (
"context" "context"
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
) )

4
pkg/cephfs/nodeserver.go → internal/cephfs/nodeserver.go
View File

@ -21,8 +21,8 @@ import (
"fmt" "fmt"
"os" "os"
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
pkg/cephfs/util.go → internal/cephfs/util.go
View File

@ -24,7 +24,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
pkg/cephfs/volume.go → internal/cephfs/volume.go
View File

@ -24,7 +24,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"k8s.io/klog" "k8s.io/klog"
) )

2
pkg/cephfs/volumemounter.go → internal/cephfs/volumemounter.go
View File

@ -27,7 +27,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"k8s.io/klog" "k8s.io/klog"

0
pkg/cephfs/volumemounter_test.go → internal/cephfs/volumemounter_test.go
View File

2
pkg/cephfs/volumeoptions.go → internal/cephfs/volumeoptions.go
View File

@ -24,7 +24,7 @@ import (
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
) )
type volumeOptions struct { type volumeOptions struct {

2
pkg/csi-common/controllerserver-default.go → internal/csi-common/controllerserver-default.go
View File

@ -19,7 +19,7 @@ package csicommon
import ( import (
"context" "context"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

0
pkg/csi-common/driver.go → internal/csi-common/driver.go
View File

2
pkg/csi-common/identityserver-default.go → internal/csi-common/identityserver-default.go
View File

@ -19,7 +19,7 @@ package csicommon
import ( import (
"context" "context"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
pkg/csi-common/nodeserver-default.go → internal/csi-common/nodeserver-default.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"context" "context"

0
pkg/csi-common/server.go → internal/csi-common/server.go
View File

2
pkg/csi-common/utils.go → internal/csi-common/utils.go
View File

@ -23,7 +23,7 @@ import (
"strings" "strings"
"sync/atomic" "sync/atomic"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer"

0
pkg/csi-common/utils_test.go → internal/csi-common/utils_test.go
View File

2
pkg/liveness/liveness.go → internal/liveness/liveness.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"time" "time"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
connlib "github.com/kubernetes-csi/csi-lib-utils/connection" connlib "github.com/kubernetes-csi/csi-lib-utils/connection"
"github.com/kubernetes-csi/csi-lib-utils/metrics" "github.com/kubernetes-csi/csi-lib-utils/metrics"

4
pkg/rbd/controllerserver.go → internal/rbd/controllerserver.go
View File

@ -20,8 +20,8 @@ import (
"context" "context"
"fmt" "fmt"
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer"

4
pkg/rbd/driver.go → internal/rbd/driver.go
View File

@ -17,8 +17,8 @@ limitations under the License.
package rbd package rbd
import ( import (
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"k8s.io/klog" "k8s.io/klog"

0
pkg/rbd/errors.go → internal/rbd/errors.go
View File

2
pkg/rbd/identityserver.go → internal/rbd/identityserver.go
View File

@ -19,7 +19,7 @@ package rbd
import ( import (
"context" "context"
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
) )

4
pkg/rbd/nodeserver.go → internal/rbd/nodeserver.go
View File

@ -23,8 +23,8 @@ import (
"strconv" "strconv"
"strings" "strings"
csicommon "github.com/ceph/ceph-csi/pkg/csi-common" csicommon "github.com/ceph/ceph-csi/internal/csi-common"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

0
pkg/rbd/nodeserver_test.go → internal/rbd/nodeserver_test.go
View File

2
pkg/rbd/rbd_attach.go → internal/rbd/rbd_attach.go
View File

@ -25,7 +25,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog" "k8s.io/klog"

2
pkg/rbd/rbd_journal.go → internal/rbd/rbd_journal.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/pkg/errors" "github.com/pkg/errors"
"k8s.io/klog" "k8s.io/klog"

2
pkg/rbd/rbd_util.go → internal/rbd/rbd_util.go
View File

@ -28,7 +28,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/ceph/ceph-csi/pkg/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/ceph/go-ceph/rados" "github.com/ceph/go-ceph/rados"
librbd "github.com/ceph/go-ceph/rbd" librbd "github.com/ceph/go-ceph/rbd"

0
pkg/rbd/rbd_util_test.go → internal/rbd/rbd_util_test.go
View File

0
pkg/util/cachepersister.go → internal/util/cachepersister.go
View File

0
pkg/util/cephcmds.go → internal/util/cephcmds.go
View File

0
pkg/util/cephconf.go → internal/util/cephconf.go
View File

0
pkg/util/conn_pool.go → internal/util/conn_pool.go
View File

0
pkg/util/conn_pool_test.go → internal/util/conn_pool_test.go
View File

0
pkg/util/credentials.go → internal/util/credentials.go
View File

0
pkg/util/crypto.go → internal/util/crypto.go
View File

0
pkg/util/cryptsetup.go → internal/util/cryptsetup.go
View File

0
pkg/util/csiconfig.go → internal/util/csiconfig.go
View File

0
pkg/util/csiconfig_test.go → internal/util/csiconfig_test.go
View File

0
pkg/util/errors.go → internal/util/errors.go
View File

0
pkg/util/httpserver.go → internal/util/httpserver.go
View File

0
pkg/util/idlocker.go → internal/util/idlocker.go
View File

0
pkg/util/idlocker_test.go → internal/util/idlocker_test.go
View File

0
pkg/util/k8scmcache.go → internal/util/k8scmcache.go
View File

0
pkg/util/log.go → internal/util/log.go
View File

0
pkg/util/nodecache.go → internal/util/nodecache.go
View File

0
pkg/util/pidlimit.go → internal/util/pidlimit.go
View File

0
pkg/util/pidlimit_test.go → internal/util/pidlimit_test.go
View File

0
pkg/util/stripsecrets.go → internal/util/stripsecrets.go
View File

0
pkg/util/topology.go → internal/util/topology.go
View File

0
pkg/util/topology_test.go → internal/util/topology_test.go
View File

0
pkg/util/util.go → internal/util/util.go
View File

0
pkg/util/util_test.go → internal/util/util_test.go
View File

0
pkg/util/validate.go → internal/util/validate.go
View File

0
pkg/util/vault.go → internal/util/vault.go
View File

0
pkg/util/volid.go → internal/util/volid.go
View File

0
pkg/util/volid_test.go → internal/util/volid_test.go
View File

0
pkg/util/voljournal.go → internal/util/voljournal.go
View File

2
scripts/gosec.sh
View File

@ -6,7 +6,7 @@ if [[ -x "$(command -v gosec)" ]]; then
# gosec does not support -mod=vendor, so fallback to non-module support and # gosec does not support -mod=vendor, so fallback to non-module support and
# assume all dependencies are available in ./vendor already # assume all dependencies are available in ./vendor already
export GO111MODULE=off export GO111MODULE=off
find cmd pkg -type d -print0 | xargs --null gosec find cmd internal -type d -print0 | xargs --null gosec
else else
echo "WARNING: gosec not found, skipping security tests" >&2 echo "WARNING: gosec not found, skipping security tests" >&2
fi fi