Move fieldmask package to proto dir (#38)

nebius · Dec 10, 2024 · 572d0d7 · 572d0d7
1 parent 11e61c1
commit 572d0d7
Show file tree

Hide file tree

Showing 54 changed files with 52 additions and 52 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -360,18 +360,18 @@ issues:
         - wrapcheck
 
     ## specific to gosdk
-    - path: "^fieldmask"
+    - path: "^proto/fieldmask"
       linters:
         - nestif
-    - path: "^fieldmask/.+_test.go"
+    - path: "^proto/fieldmask/.+_test.go"
       linters:
         - lll
     - path: "^example_test.go$"
       linters:
         - testableexamples
     - path: "operations/alphaops"
       text: "SA1019: .+ is deprecated"
-    - path: "fieldmask"
+    - path: "^proto/fieldmask"
       linters:
         - nilnil # TODO: fix or ignore
         - recvcheck # TODO: fix or ignore

diff --git a/fieldmask/grpcheader/common.go → proto/fieldmask/grpcheader/common.go b/fieldmask/grpcheader/common.go → proto/fieldmask/grpcheader/common.go
@@ -7,7 +7,7 @@ import (
 
 	"google.golang.org/grpc/metadata"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 // IsInOutgoingContext checks if a metadata key (grpc header) exists in the

diff --git a/fieldmask/grpcheader/common_test.go → proto/fieldmask/grpcheader/common_test.go b/fieldmask/grpcheader/common_test.go → proto/fieldmask/grpcheader/common_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 func TestIsInOutgoingContext(t *testing.T) {

diff --git a/fieldmask/grpcheader/resetmask.go → proto/fieldmask/grpcheader/resetmask.go b/fieldmask/grpcheader/resetmask.go → proto/fieldmask/grpcheader/resetmask.go
@@ -6,8 +6,8 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
-	"github.com/nebius/gosdk/fieldmask/protobuf"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf"
 )
 
 // ResetMask is the gRPC header name where the reset mask will be added.

diff --git a/fieldmask/grpcheader/resetmask_test.go → proto/fieldmask/grpcheader/resetmask_test.go b/fieldmask/grpcheader/resetmask_test.go → proto/fieldmask/grpcheader/resetmask_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
-	"github.com/nebius/gosdk/fieldmask/protobuf/testdata"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf/testdata"
 )
 
 func TestIsResetMaskInOutgoingContext(t *testing.T) {

diff --git a/fieldmask/grpcheader/selectmask.go → proto/fieldmask/grpcheader/selectmask.go b/fieldmask/grpcheader/selectmask.go → proto/fieldmask/grpcheader/selectmask.go
@@ -3,7 +3,7 @@ package grpcheader
 import (
 	"context"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 // SelectMask is the gRPC header name where the select mask will be added.

diff --git a/fieldmask/grpcheader/selectmask_test.go → ...o/fieldmask/grpcheader/selectmask_test.go b/fieldmask/grpcheader/selectmask_test.go → ...o/fieldmask/grpcheader/selectmask_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 func TestIsSelectMaskInOutgoingContext(t *testing.T) {

diff --git a/fieldmask/mask/fieldkey.go → proto/fieldmask/mask/fieldkey.go b/fieldmask/mask/fieldkey.go → proto/fieldmask/mask/fieldkey.go
diff --git a/fieldmask/mask/fieldkey_test.go → proto/fieldmask/mask/fieldkey_test.go b/fieldmask/mask/fieldkey_test.go → proto/fieldmask/mask/fieldkey_test.go
diff --git a/fieldmask/mask/fieldpath.go → proto/fieldmask/mask/fieldpath.go b/fieldmask/mask/fieldpath.go → proto/fieldmask/mask/fieldpath.go
diff --git a/fieldmask/mask/fieldpath_test.go → proto/fieldmask/mask/fieldpath_test.go b/fieldmask/mask/fieldpath_test.go → proto/fieldmask/mask/fieldpath_test.go
diff --git a/fieldmask/mask/mask.go → proto/fieldmask/mask/mask.go b/fieldmask/mask/mask.go → proto/fieldmask/mask/mask.go
diff --git a/fieldmask/mask/mask_test.go → proto/fieldmask/mask/mask_test.go b/fieldmask/mask/mask_test.go → proto/fieldmask/mask/mask_test.go
diff --git a/fieldmask/mask/parse.go → proto/fieldmask/mask/parse.go b/fieldmask/mask/parse.go → proto/fieldmask/mask/parse.go
diff --git a/fieldmask/mask/parse_test.go → proto/fieldmask/mask/parse_test.go b/fieldmask/mask/parse_test.go → proto/fieldmask/mask/parse_test.go
diff --git a/fieldmask/protobuf/filter.go → proto/fieldmask/protobuf/filter.go b/fieldmask/protobuf/filter.go → proto/fieldmask/protobuf/filter.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 func recursiveFilterListWithSelectMask( //nolint:gocognit

diff --git a/fieldmask/protobuf/filter_test.go → proto/fieldmask/protobuf/filter_test.go b/fieldmask/protobuf/filter_test.go → proto/fieldmask/protobuf/filter_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
-	"github.com/nebius/gosdk/fieldmask/protobuf/testdata"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf/testdata"
 )
 
 func TestFilterWithSelectMask(t *testing.T) {

diff --git a/fieldmask/protobuf/from_descriptor.go → proto/fieldmask/protobuf/from_descriptor.go b/fieldmask/protobuf/from_descriptor.go → proto/fieldmask/protobuf/from_descriptor.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 const recursionTooDeep = 1000

diff --git a/fieldmask/protobuf/from_descriptor_test.go → ...ieldmask/protobuf/from_descriptor_test.go b/fieldmask/protobuf/from_descriptor_test.go → ...ieldmask/protobuf/from_descriptor_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nebius/gosdk/fieldmask/protobuf/testdata"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf/testdata"
 )
 
 func TestKnownFieldsFromMessage(t *testing.T) {

diff --git a/fieldmask/protobuf/from_message.go → proto/fieldmask/protobuf/from_message.go b/fieldmask/protobuf/from_message.go → proto/fieldmask/protobuf/from_message.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 func rmFromMessageRecursive( //nolint:gocognit // TODO: simplify

diff --git a/fieldmask/protobuf/from_message_test.go → ...o/fieldmask/protobuf/from_message_test.go b/fieldmask/protobuf/from_message_test.go → ...o/fieldmask/protobuf/from_message_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nebius/gosdk/fieldmask/protobuf/testdata"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf/testdata"
 )
 
 func TestResetMaskFromMessage(t *testing.T) {

diff --git a/fieldmask/protobuf/from_modified.go → proto/fieldmask/protobuf/from_modified.go b/fieldmask/protobuf/from_modified.go → proto/fieldmask/protobuf/from_modified.go
@@ -8,7 +8,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 func rmFrom2ListsRecursive(

diff --git a/fieldmask/protobuf/from_modified_test.go → .../fieldmask/protobuf/from_modified_test.go b/fieldmask/protobuf/from_modified_test.go → .../fieldmask/protobuf/from_modified_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nebius/gosdk/fieldmask/protobuf/testdata"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf/testdata"
 )
 
 func TestResetMaskFromModified(t *testing.T) {

diff --git a/fieldmask/protobuf/manipulate.go → proto/fieldmask/protobuf/manipulate.go b/fieldmask/protobuf/manipulate.go → proto/fieldmask/protobuf/manipulate.go
@@ -9,7 +9,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 )
 
 var ErrBasicTypeInTheMiddle = errors.New("found basic type in the middle of the path, can't descend deeper")

diff --git a/fieldmask/protobuf/manipulate_test.go → proto/fieldmask/protobuf/manipulate_test.go b/fieldmask/protobuf/manipulate_test.go → proto/fieldmask/protobuf/manipulate_test.go
@@ -12,8 +12,8 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
-	"github.com/nebius/gosdk/fieldmask/protobuf/testdata"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf/testdata"
 )
 
 func TestGetAtFieldPath(t *testing.T) {

diff --git a/fieldmask/protobuf/patch.go → proto/fieldmask/protobuf/patch.go b/fieldmask/protobuf/patch.go → proto/fieldmask/protobuf/patch.go
@@ -8,7 +8,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
 	"github.com/nebius/gosdk/proto/nebius"
 )
 

diff --git a/fieldmask/protobuf/patch_test.go → proto/fieldmask/protobuf/patch_test.go b/fieldmask/protobuf/patch_test.go → proto/fieldmask/protobuf/patch_test.go
@@ -9,8 +9,8 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nebius/gosdk/fieldmask/mask"
-	"github.com/nebius/gosdk/fieldmask/protobuf/testdata"
+	"github.com/nebius/gosdk/proto/fieldmask/mask"
+	"github.com/nebius/gosdk/proto/fieldmask/protobuf/testdata"
 )
 
 func TestPatchWithResetMask(t *testing.T) {

diff --git a/...ask/protobuf/testdata/data_for_test.pb.go → ...ask/protobuf/testdata/data_for_test.pb.go b/...ask/protobuf/testdata/data_for_test.pb.go → ...ask/protobuf/testdata/data_for_test.pb.go
diff --git a/...ask/protobuf/testdata/data_for_test.proto → ...ask/protobuf/testdata/data_for_test.proto b/...ask/protobuf/testdata/data_for_test.proto → ...ask/protobuf/testdata/data_for_test.proto
diff --git a/services/nebius/compute/v1/disk_service.sdk.go b/services/nebius/compute/v1/disk_service.sdk.go
diff --git a/services/nebius/compute/v1/filesystem_service.sdk.go b/services/nebius/compute/v1/filesystem_service.sdk.go
diff --git a/services/nebius/compute/v1/gpu_cluster_service.sdk.go b/services/nebius/compute/v1/gpu_cluster_service.sdk.go
diff --git a/services/nebius/compute/v1/instance_service.sdk.go b/services/nebius/compute/v1/instance_service.sdk.go
diff --git a/services/nebius/compute/v1alpha1/disk_service.sdk.go b/services/nebius/compute/v1alpha1/disk_service.sdk.go
diff --git a/services/nebius/compute/v1alpha1/filesystem_service.sdk.go b/services/nebius/compute/v1alpha1/filesystem_service.sdk.go
diff --git a/services/nebius/compute/v1alpha1/gpu_cluster_service.sdk.go b/services/nebius/compute/v1alpha1/gpu_cluster_service.sdk.go
diff --git a/services/nebius/compute/v1alpha1/instance_service.sdk.go b/services/nebius/compute/v1alpha1/instance_service.sdk.go
diff --git a/services/nebius/iam/v1/access_key_service.sdk.go b/services/nebius/iam/v1/access_key_service.sdk.go
diff --git a/services/nebius/iam/v1/auth_public_key_service.sdk.go b/services/nebius/iam/v1/auth_public_key_service.sdk.go
diff --git a/services/nebius/iam/v1/federation_certificate_service.sdk.go b/services/nebius/iam/v1/federation_certificate_service.sdk.go
diff --git a/services/nebius/iam/v1/federation_service.sdk.go b/services/nebius/iam/v1/federation_service.sdk.go
diff --git a/services/nebius/iam/v1/invitation_service.sdk.go b/services/nebius/iam/v1/invitation_service.sdk.go
diff --git a/services/nebius/iam/v1/service_account_service.sdk.go b/services/nebius/iam/v1/service_account_service.sdk.go
diff --git a/services/nebius/mk8s/v1/cluster_service.sdk.go b/services/nebius/mk8s/v1/cluster_service.sdk.go
diff --git a/services/nebius/mk8s/v1/node_group_service.sdk.go b/services/nebius/mk8s/v1/node_group_service.sdk.go