Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rm/Delete deprecated inspect commands #2669

Merged
merged 1 commit into from
Dec 25, 2023
Merged

rm/Delete deprecated inspect commands #2669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ Changelog for NeoFS Node
- Created files are not group writable (#2589)

### Removed
- Deprecated `neofs-adm [...] inspect` commands (#2603)

### Updated

### Updating from v0.39.2
`neofs-adm [...] inspect` commands were deleted, use `get` instead.

## [0.39.2] - 2023-12-21

Expand Down
11 changes: 0 additions & 11 deletions cmd/neofs-lens/internal/meta/inspect.go → cmd/neofs-lens/internal/meta/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ import (
"github.com/spf13/cobra"
)

var inspectCMD = &cobra.Command{
Use: "inspect",
Short: "Object inspection",
Long: `Inspect specific object in a metabase.`,
Deprecated: "will be removed in the next release. Use `get` instead.",
Run: getFunc,
}

var getCMD = &cobra.Command{
Use: "get",
Short: "Object inspection",
Expand All @@ -27,9 +19,6 @@ var getCMD = &cobra.Command{
}

func init() {
common.AddAddressFlag(inspectCMD, &vAddress)
common.AddComponentPathFlag(inspectCMD, &vPath)

common.AddAddressFlag(getCMD, &vAddress)
common.AddComponentPathFlag(getCMD, &vPath)
}
Expand Down
1 change: 0 additions & 1 deletion cmd/neofs-lens/internal/meta/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ var Root = &cobra.Command{

func init() {
Root.AddCommand(
inspectCMD,
listGraveyardCMD,
listGarbageCMD,
writeObjectCMD,
Expand Down
13 changes: 0 additions & 13 deletions cmd/neofs-lens/internal/peapod/inspect.go → cmd/neofs-lens/internal/peapod/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ import (
"github.com/spf13/cobra"
)

var inspectCMD = &cobra.Command{
Use: "inspect",
Short: "Object inspection",
Long: `Inspect specific object in a Peapod.`,
Deprecated: "will be removed in the next release. Use `get` instead.",
Run: getFunc,
}

var getCMD = &cobra.Command{
Use: "get",
Short: "Get object",
Expand All @@ -22,11 +14,6 @@ var getCMD = &cobra.Command{
}

func init() {
common.AddAddressFlag(inspectCMD, &vAddress)
common.AddComponentPathFlag(inspectCMD, &vPath)
common.AddOutputFileFlag(inspectCMD, &vOut)
common.AddPayloadOnlyFlag(inspectCMD, &vPayloadOnly)

common.AddAddressFlag(getCMD, &vAddress)
common.AddComponentPathFlag(getCMD, &vPath)
common.AddOutputFileFlag(getCMD, &vOut)
Expand Down
3 changes: 2 additions & 1 deletion cmd/neofs-lens/internal/peapod/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ var Root = &cobra.Command{
}

func init() {
Root.AddCommand(listCMD, inspectCMD, getCMD)
Root.AddCommand(listCMD)
Root.AddCommand(getCMD)
}

// open and returns read-only peapod.Peapod located in vPath.
Expand Down
14 changes: 0 additions & 14 deletions cmd/neofs-lens/internal/storage/inspect.go → cmd/neofs-lens/internal/storage/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ import (
"github.com/spf13/cobra"
)

var storageInspectObjCMD = &cobra.Command{
Use: "inspect",
Short: "Get object from the NeoFS node's storage snapshot",
Long: "Get object from the NeoFS node's storage snapshot",
Deprecated: "will be removed in the next release. Use `get` instead.",
Args: cobra.NoArgs,
Run: getFunc,
}

var storageGetObjCMD = &cobra.Command{
Use: "get",
Short: "Get object from the NeoFS node's storage snapshot",
Expand All @@ -25,11 +16,6 @@ var storageGetObjCMD = &cobra.Command{
}

func init() {
common.AddAddressFlag(storageInspectObjCMD, &vAddress)
common.AddOutputFileFlag(storageInspectObjCMD, &vOut)
common.AddConfigFileFlag(storageInspectObjCMD, &vConfig)
common.AddPayloadOnlyFlag(storageInspectObjCMD, &vPayloadOnly)

common.AddAddressFlag(storageGetObjCMD, &vAddress)
common.AddOutputFileFlag(storageGetObjCMD, &vOut)
common.AddConfigFileFlag(storageGetObjCMD, &vConfig)
Expand Down
1 change: 0 additions & 1 deletion cmd/neofs-lens/internal/storage/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ var Root = &cobra.Command{

func init() {
Root.AddCommand(
storageInspectObjCMD,
storageGetObjCMD,
storageStatusObjCMD,
)
Expand Down
13 changes: 0 additions & 13 deletions ...neofs-lens/internal/writecache/inspect.go → cmd/neofs-lens/internal/writecache/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ import (
"github.com/spf13/cobra"
)

var inspectCMD = &cobra.Command{
Use: "inspect",
Short: "Object inspection",
Long: `Inspect specific object in a write-cache.`,
Deprecated: "will be removed in the next release. Use `get` instead.",
Run: getFunc,
}

var getCMD = &cobra.Command{
Use: "get",
Short: "Object inspection",
Expand All @@ -23,11 +15,6 @@ var getCMD = &cobra.Command{
}

func init() {
common.AddAddressFlag(inspectCMD, &vAddress)
common.AddComponentPathFlag(inspectCMD, &vPath)
common.AddOutputFileFlag(inspectCMD, &vOut)
common.AddPayloadOnlyFlag(inspectCMD, &vPayloadOnly)

common.AddAddressFlag(getCMD, &vAddress)
common.AddComponentPathFlag(getCMD, &vPath)
common.AddOutputFileFlag(getCMD, &vOut)
Expand Down
3 changes: 2 additions & 1 deletion cmd/neofs-lens/internal/writecache/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ var Root = &cobra.Command{
}

func init() {
Root.AddCommand(listCMD, inspectCMD, getCMD)
Root.AddCommand(listCMD)
Root.AddCommand(getCMD)
}

func openWC(cmd *cobra.Command) *bbolt.DB {
Expand Down
Loading