From 966d92574efc47c773639d25f21c096a4cf409c2 Mon Sep 17 00:00:00 2001 From: ovandriyanov Date: Thu, 29 Aug 2024 13:37:03 +0300 Subject: [PATCH] Decouple transfer_manager Remove unnecessary dependencies on transfer_manager by moving the code to the common libraries 4196af89d6b162b2ecd9c7e6d60500c242ce1e87 --- .../util => cloud/dataplatform/ycloud/protoutil}/protobuf.go | 2 +- .../dataplatform/ycloud/protoutil}/protobuf_test.go | 2 +- transfer_manager/go/pkg/util/log.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename {transfer_manager/go/pkg/util => cloud/dataplatform/ycloud/protoutil}/protobuf.go (99%) rename {transfer_manager/go/pkg/util => cloud/dataplatform/ycloud/protoutil}/protobuf_test.go (99%) diff --git a/transfer_manager/go/pkg/util/protobuf.go b/cloud/dataplatform/ycloud/protoutil/protobuf.go similarity index 99% rename from transfer_manager/go/pkg/util/protobuf.go rename to cloud/dataplatform/ycloud/protoutil/protobuf.go index 1381fb8e..69b2c556 100644 --- a/transfer_manager/go/pkg/util/protobuf.go +++ b/cloud/dataplatform/ycloud/protoutil/protobuf.go @@ -1,4 +1,4 @@ -package util +package protoutil import ( cloud "github.com/doublecloud/transfer/cloud/bitbucket/private-api/yandex/cloud/priv" diff --git a/transfer_manager/go/pkg/util/protobuf_test.go b/cloud/dataplatform/ycloud/protoutil/protobuf_test.go similarity index 99% rename from transfer_manager/go/pkg/util/protobuf_test.go rename to cloud/dataplatform/ycloud/protoutil/protobuf_test.go index 4c2438eb..832c6a67 100644 --- a/transfer_manager/go/pkg/util/protobuf_test.go +++ b/cloud/dataplatform/ycloud/protoutil/protobuf_test.go @@ -1,4 +1,4 @@ -package util +package protoutil import ( "testing" diff --git a/transfer_manager/go/pkg/util/log.go b/transfer_manager/go/pkg/util/log.go index cbfe66d0..82e3a9bd 100644 --- a/transfer_manager/go/pkg/util/log.go +++ b/transfer_manager/go/pkg/util/log.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" + "github.com/doublecloud/transfer/cloud/dataplatform/ycloud/protoutil" "go.ytsaurus.tech/library/go/core/log" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/reflect/protoreflect" @@ -34,7 +35,7 @@ func AppendRequestDataField( fieldNames FieldNames, lgr log.Logger, ) []log.Field { - logSafeMessage := CopyWithoutSensitiveFields(protoMessage) + logSafeMessage := protoutil.CopyWithoutSensitiveFields(protoMessage) logSafeJSON, err := protojson.MarshalOptions{UseProtoNames: true}.Marshal(logSafeMessage) if err != nil { lgr.Warn(fmt.Sprintf("Cannot marshal %s message into JSON", fieldNames.MainName), log.Error(err))