From 023396e6a4dfe5a0abcce7d62cb58973769a8891 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 10 Jan 2023 15:59:39 +0300 Subject: [PATCH] [#11] adm: Remove `NeoFS` mentions Signed-off-by: Evgenii Stratonikov --- cmd/frostfs-adm/README.md | 2 +- .../internal/modules/morph/internal/types.go | 8 ++-- .../modules/morph/internal/types.pb.go | 37 +++++++++---------- .../modules/morph/internal/types.proto | 2 +- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/cmd/frostfs-adm/README.md b/cmd/frostfs-adm/README.md index 13bcd1117..30a83690b 100644 --- a/cmd/frostfs-adm/README.md +++ b/cmd/frostfs-adm/README.md @@ -1,4 +1,4 @@ -# NeoFS Admin Tool +# FrostFS Admin Tool ## Overview diff --git a/cmd/frostfs-adm/internal/modules/morph/internal/types.go b/cmd/frostfs-adm/internal/modules/morph/internal/types.go index 705ae0074..93d2cb00e 100644 --- a/cmd/frostfs-adm/internal/modules/morph/internal/types.go +++ b/cmd/frostfs-adm/internal/modules/morph/internal/types.go @@ -18,7 +18,7 @@ func StringifySubnetClientGroupID(id *SubnetClientGroupID) string { return string(text) } -// MarshalText encodes SubnetClientGroupID into text format according to NeoFS API V2 protocol: +// MarshalText encodes SubnetClientGroupID into text format according to FrostFS API V2 protocol: // value in base-10 integer string format. // // It implements encoding.TextMarshaler. @@ -28,7 +28,7 @@ func (x *SubnetClientGroupID) MarshalText() ([]byte, error) { return []byte(strconv.FormatUint(uint64(num), 10)), nil } -// UnmarshalText decodes the SubnetID from the text according to NeoFS API V2 protocol: +// UnmarshalText decodes the SubnetID from the text according to FrostFS API V2 protocol: // should be base-10 integer string format with bitsize = 32. // // Returns strconv.ErrRange if integer overflows uint32. @@ -47,13 +47,13 @@ func (x *SubnetClientGroupID) UnmarshalText(txt []byte) error { return nil } -// Marshal encodes the SubnetClientGroupID into a binary format of NeoFS API V2 protocol +// Marshal encodes the SubnetClientGroupID into a binary format of FrostFS API V2 protocol // (Protocol Buffers with direct field order). func (x *SubnetClientGroupID) Marshal() ([]byte, error) { return proto.Marshal(x) } -// Unmarshal decodes the SubnetClientGroupID from NeoFS API V2 binary format (see Marshal). Must not be called on nil. +// Unmarshal decodes the SubnetClientGroupID from FrostFS API V2 binary format (see Marshal). Must not be called on nil. func (x *SubnetClientGroupID) Unmarshal(data []byte) error { return proto.Unmarshal(data, x) } diff --git a/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go b/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go index 62e41763f..49cce0aeb 100644 --- a/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go +++ b/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go @@ -1,17 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.7 +// protoc v3.21.12 // source: cmd/frostfs-adm/internal/modules/morph/internal/types.proto package internal import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -21,7 +20,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// Client group identifier in the NeoFS subnet. +// Client group identifier in the FrostFS subnet. // // String representation of a value is base-10 integer. // @@ -77,20 +76,20 @@ func (x *SubnetClientGroupID) GetValue() uint32 { var File_cmd_frostfs_adm_internal_modules_morph_internal_types_proto protoreflect.FileDescriptor var file_cmd_frostfs_adm_internal_modules_morph_internal_types_proto_rawDesc = []byte{ - 0x0a, 0x39, 0x63, 0x6d, 0x64, 0x2f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x2d, 0x61, 0x64, 0x6d, 0x2f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, - 0x2f, 0x6d, 0x6f, 0x72, 0x70, 0x68, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0e, 0x6e, 0x65, 0x6f, - 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x65, 0x66, 0x73, 0x22, 0x2b, 0x0a, 0x13, 0x53, - 0x75, 0x62, 0x6e, 0x65, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x07, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, - 0x2f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x63, 0x6d, 0x64, 0x2f, - 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x2d, 0x61, 0x64, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x6d, 0x6f, 0x72, 0x70, 0x68, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x0a, 0x3b, 0x63, 0x6d, 0x64, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x61, 0x64, + 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, + 0x65, 0x73, 0x2f, 0x6d, 0x6f, 0x72, 0x70, 0x68, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0e, 0x6e, + 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x65, 0x66, 0x73, 0x22, 0x2b, 0x0a, + 0x13, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x07, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x56, 0x5a, 0x54, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, + 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, + 0x64, 0x65, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x61, + 0x64, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, + 0x6c, 0x65, 0x73, 0x2f, 0x6d, 0x6f, 0x72, 0x70, 0x68, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cmd/frostfs-adm/internal/modules/morph/internal/types.proto b/cmd/frostfs-adm/internal/modules/morph/internal/types.proto index c15744f3f..8f5ce70d1 100644 --- a/cmd/frostfs-adm/internal/modules/morph/internal/types.proto +++ b/cmd/frostfs-adm/internal/modules/morph/internal/types.proto @@ -4,7 +4,7 @@ package neo.fs.v2.refs; option go_package = "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/internal"; -// Client group identifier in the NeoFS subnet. +// Client group identifier in the FrostFS subnet. // // String representation of a value is base-10 integer. //