diff --git a/flyteadmin/pkg/async/cloudevent/factory.go b/flyteadmin/pkg/async/cloudevent/factory.go index 3e430ee179..65cd48de93 100644 --- a/flyteadmin/pkg/async/cloudevent/factory.go +++ b/flyteadmin/pkg/async/cloudevent/factory.go @@ -21,7 +21,7 @@ import ( runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flyte/flytestdlib/sandbox_utils" + "github.com/flyteorg/flyte/flytestdlib/sandboxutils" "github.com/flyteorg/flyte/flytestdlib/storage" ) @@ -92,7 +92,7 @@ func NewCloudEventsPublisher(ctx context.Context, db repositoryInterfaces.Reposi case common.Sandbox: var publisher pubsub.Publisher - publisher = sandbox_utils.NewCloudEventsPublisher() + publisher = sandboxutils.NewCloudEventsPublisher() sender = &cloudEventImplementations.PubSubSender{ Pub: publisher, } diff --git a/flyteartifacts/pkg/server/processor/channel_processor.go b/flyteartifacts/pkg/server/processor/channel_processor.go index d32175ef1c..741c5801f9 100644 --- a/flyteartifacts/pkg/server/processor/channel_processor.go +++ b/flyteartifacts/pkg/server/processor/channel_processor.go @@ -7,14 +7,14 @@ import ( "github.com/cloudevents/sdk-go/v2/event" flyteEvents "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event" "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyte/flytestdlib/sandbox_utils" + "github.com/flyteorg/flyte/flytestdlib/sandboxutils" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" "time" ) type SandboxCloudEventsReceiver struct { - subChan <-chan sandbox_utils.SandboxMessage + subChan <-chan sandboxutils.SandboxMessage Handler EventsHandlerInterface } @@ -33,7 +33,7 @@ func (p *SandboxCloudEventsReceiver) StartProcessing(ctx context.Context) { logger.Warning(context.Background(), "Sandbox cloud event processor has stopped because context cancelled") } -func (p *SandboxCloudEventsReceiver) handleMessage(ctx context.Context, sandboxMsg sandbox_utils.SandboxMessage) error { +func (p *SandboxCloudEventsReceiver) handleMessage(ctx context.Context, sandboxMsg sandboxutils.SandboxMessage) error { ce := &event.Event{} err := pbcloudevents.Protobuf.Unmarshal(sandboxMsg.Raw, ce) if err != nil { @@ -112,6 +112,6 @@ func (p *SandboxCloudEventsReceiver) StopProcessing() error { func NewSandboxCloudEventProcessor(eventsHandler EventsHandlerInterface) *SandboxCloudEventsReceiver { return &SandboxCloudEventsReceiver{ Handler: eventsHandler, - subChan: sandbox_utils.MsgChan, + subChan: sandboxutils.MsgChan, } } diff --git a/flytestdlib/database/db.go b/flytestdlib/database/db.go index 1a8f07760e..fe884c75f4 100644 --- a/flytestdlib/database/db.go +++ b/flytestdlib/database/db.go @@ -4,10 +4,11 @@ import ( "context" "fmt" - "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/driver/sqlite" "gorm.io/gorm" + + "github.com/flyteorg/flyte/flytestdlib/logger" ) // GetDB uses the dbConfig to create gorm DB object. If the db doesn't exist for the dbConfig then a new one is created diff --git a/flytestdlib/database/postgres.go b/flytestdlib/database/postgres.go index 877b9a2ad6..1254dd5d14 100644 --- a/flytestdlib/database/postgres.go +++ b/flytestdlib/database/postgres.go @@ -8,11 +8,12 @@ import ( "os" "strings" - "github.com/flyteorg/flyte/flytestdlib/logger" oldPgConn "github.com/jackc/pgconn" "github.com/jackc/pgx/v5/pgconn" "gorm.io/driver/postgres" "gorm.io/gorm" + + "github.com/flyteorg/flyte/flytestdlib/logger" ) const pqInvalidDBCode = "3D000" diff --git a/flytestdlib/sandbox_utils/processor.go b/flytestdlib/sandboxutils/processor.go similarity index 98% rename from flytestdlib/sandbox_utils/processor.go rename to flytestdlib/sandboxutils/processor.go index 79b1eb14ab..9b6731691b 100644 --- a/flytestdlib/sandbox_utils/processor.go +++ b/flytestdlib/sandboxutils/processor.go @@ -1,12 +1,14 @@ -package sandbox_utils +package sandboxutils import ( "context" "fmt" - "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/golang/protobuf/proto" "sync" "time" + + "github.com/golang/protobuf/proto" + + "github.com/flyteorg/flyte/flytestdlib/logger" ) var MsgChan chan SandboxMessage