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

[Monorepo] - Proclaim monorepo #4014

Merged
merged 19 commits into from
Sep 25, 2023
Merged

[Monorepo] - Proclaim monorepo #4014

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
325fca4
Add go replace directives
eapolinario Sep 8, 2023
7023503
Rename modules and add go replace directives
eapolinario Sep 8, 2023
60eb482
Rename imports in datacatalog
eapolinario Sep 8, 2023
056fd9a
Rename imports in flyteadmin
eapolinario Sep 8, 2023
98c4a7c
Rename imports in flytecopilot
eapolinario Sep 8, 2023
435c57a
Rename imports in flyteplugins
eapolinario Sep 8, 2023
1f319c2
Rename imports in flytepropeller
eapolinario Sep 8, 2023
01a9926
Rename imports in flytestdlib
eapolinario Sep 8, 2023
11afeb5
Merge branch 'master' into monorepo--rename-modules-and-go-replace
eapolinario Sep 8, 2023
53374b8
Merge branch 'master' into monorepo--rename-modules-and-go-replace
eapolinario Sep 8, 2023
7ecf3f8
Import flyteidl and add necessary go replace directives
eapolinario Sep 8, 2023
bc64534
Fix flytecopilot references
eapolinario Sep 9, 2023
129c429
Merge remote-tracking branch 'origin' into monorepo--rename-modules-a…
eapolinario Sep 12, 2023
b55f27b
Run make helm
eapolinario Sep 12, 2023
2d0bbc4
Monorepo build images (#4027)
eapolinario Sep 13, 2023
6338b90
[Monorepo] - Fix single binary (#4015)
eapolinario Sep 13, 2023
4fdf255
Run make generate in flytepropeller
eapolinario Sep 13, 2023
a63e57f
Build sandbox-lite using monorepo
eapolinario Sep 18, 2023
2f3bd55
Comment out push_docker_image step
eapolinario Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions charts/flyte-binary/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,4 @@ Chart for basic single Flyte executable deployment
| serviceAccount.imagePullSecrets | list | `[]` | |
| serviceAccount.labels | object | `{}` | |
| serviceAccount.name | string | `""` | |

2 changes: 1 addition & 1 deletion charts/flyte-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,4 @@ helm install gateway bitnami/contour -n flyte
| webhook.serviceAccount.create | bool | `true` | Should a service account be created for the webhook |
| webhook.serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service account |
| workflow_notifications | object | `{"config":{},"enabled":false}` | **Optional Component** Workflow notifications module is an optional dependency. Flyte uses cloud native pub-sub systems to notify users of various events in their workflows |
| workflow_scheduler | object | `{"config":{},"enabled":false,"type":""}` | **Optional Component** Flyte uses a cloud hosted Cron scheduler to run workflows on a schedule. The following module is optional. Without, this module, you will not have scheduled launchplans / workflows. Docs: https://docs.flyte.org/en/latest/howto/enable_and_use_schedules.html#setting-up-scheduled-workflows |
| workflow_scheduler | object | `{"config":{},"enabled":false,"type":""}` | **Optional Component** Flyte uses a cloud hosted Cron scheduler to run workflows on a schedule. The following module is optional. Without, this module, you will not have scheduled launchplans / workflows. Docs: https://docs.flyte.org/en/latest/howto/enable_and_use_schedules.html#setting-up-scheduled-workflows |
2 changes: 1 addition & 1 deletion charts/flyte-deps/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ helm upgrade -f values.yaml flyte .
| sparkoperator | object | `{"enabled":false}` | Optional: Spark Plugin using the Spark Operator |
| sparkoperator.enabled | bool | `false` | - enable or disable Sparkoperator deployment installation |
| webhook.enabled | bool | `true` | |
| webhook.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"ClusterIP"}` | Service settings for the webhook |
| webhook.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"ClusterIP"}` | Service settings for the webhook |
1 change: 1 addition & 0 deletions charts/flyte-sandbox/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,4 @@ A Helm chart for the Flyte local sandbox
| sandbox.proxy.image.pullPolicy | string | `"Never"` | |
| sandbox.proxy.image.repository | string | `"envoyproxy/envoy"` | |
| sandbox.proxy.image.tag | string | `"sandbox"` | |

2 changes: 1 addition & 1 deletion charts/flyte/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,4 @@ helm upgrade -f values-sandbox.yaml flyte .
| redoc.service | object | `{"type":"ClusterIP"}` | Service settings for Minio |
| redoc.tolerations | list | `[]` | tolerations for Minio deployment |
| sparkoperator | object | `{"enabled":false}` | Optional: Spark Plugin using the Spark Operator |
| sparkoperator.enabled | bool | `false` | - enable or disable Sparkoperator deployment installation |
| sparkoperator.enabled | bool | `false` | - enable or disable Sparkoperator deployment installation |
1 change: 1 addition & 0 deletions charts/flyteagent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ A Helm chart for Flyte agent
| serviceAccount.create | bool | `true` | Should a service account be created for flyteagent |
| serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service account |
| tolerations | list | `[]` | tolerations for flyteagent deployment |

2 changes: 1 addition & 1 deletion datacatalog/boilerplate/flyte/golang_support_tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package tools
import (
_ "github.com/EngHabu/mockery/cmd/mockery"
_ "github.com/alvaroloes/enumer"
_ "github.com/flyteorg/flytestdlib/cli/pflags"
_ "github.com/flyteorg/flyte/flytestdlib/cli/pflags"
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
)
2 changes: 1 addition & 1 deletion datacatalog/cmd/entrypoints/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package entrypoints

import (
"github.com/flyteorg/datacatalog/pkg/repositories"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories"

"context"

Expand Down
6 changes: 3 additions & 3 deletions datacatalog/cmd/entrypoints/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"fmt"
"os"

"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/logger"

"github.com/flyteorg/flytestdlib/config"
"github.com/flyteorg/flytestdlib/config/viper"
"github.com/flyteorg/flyte/flytestdlib/config"
"github.com/flyteorg/flyte/flytestdlib/config/viper"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
14 changes: 7 additions & 7 deletions datacatalog/cmd/entrypoints/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package entrypoints
import (
"context"

"github.com/flyteorg/datacatalog/pkg/config"
"github.com/flyteorg/datacatalog/pkg/rpc/datacatalogservice"
"github.com/flyteorg/datacatalog/pkg/runtime"
"github.com/flyteorg/flytestdlib/contextutils"
"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flytestdlib/profutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/datacatalog/pkg/config"
"github.com/flyteorg/flyte/datacatalog/pkg/rpc/datacatalogservice"
"github.com/flyteorg/flyte/datacatalog/pkg/runtime"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/profutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"

"github.com/spf13/cobra"
)
Expand Down
6 changes: 3 additions & 3 deletions datacatalog/cmd/entrypoints/serve_dummy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package entrypoints
import (
"context"

"github.com/flyteorg/datacatalog/pkg/config"
"github.com/flyteorg/datacatalog/pkg/rpc/datacatalogservice"
"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flyte/datacatalog/pkg/config"
"github.com/flyteorg/flyte/datacatalog/pkg/rpc/datacatalogservice"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion datacatalog/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/flyteorg/datacatalog/cmd/entrypoints"
"github.com/flyteorg/flyte/datacatalog/cmd/entrypoints"
"github.com/golang/glog"
)

Expand Down
15 changes: 12 additions & 3 deletions datacatalog/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/flyteorg/datacatalog
module github.com/flyteorg/flyte/datacatalog

go 1.19

require (
github.com/Selvatico/go-mocket v1.0.7
github.com/flyteorg/flyteidl v1.3.6
github.com/flyteorg/flytestdlib v1.0.22
github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000
github.com/flyteorg/flyteidl v0.0.0-00010101000000-000000000000
github.com/gofrs/uuid v4.2.0+incompatible
github.com/golang/glog v1.1.0
github.com/golang/protobuf v1.5.3
Expand Down Expand Up @@ -105,3 +105,12 @@ require (
k8s.io/client-go v0.0.0-20210217172142-7279fc64d847 // indirect
k8s.io/klog/v2 v2.5.0 // indirect
)

replace (
github.com/flyteorg/flyte/datacatalog => ../datacatalog
github.com/flyteorg/flyte/flyteadmin => ../flyteadmin
github.com/flyteorg/flyte/flyteplugins => ../flyteplugins
github.com/flyteorg/flyte/flytepropeller => ../flytepropeller
github.com/flyteorg/flyte/flytestdlib => ../flytestdlib
github.com/flyteorg/flyteidl => ../flyteidl
)
6 changes: 1 addition & 5 deletions datacatalog/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/flyteorg/flyteidl v1.3.6 h1:PI846AdnrQZ84pxRVAzA3WGihv+xXmjQHO91nj/kV9g=
github.com/flyteorg/flyteidl v1.3.6/go.mod h1:Pkt2skI1LiHs/2ZoekBnyPhuGOFMiuul6HHcKGZBsbM=
github.com/flyteorg/flytestdlib v1.0.22 h1:8RAc+TmME54FInf4+t6+C7X8Z/dW6i6aTs6W8SEzpI8=
github.com/flyteorg/flytestdlib v1.0.22/go.mod h1:6nXa5g00qFIsgdvQ7jKQMJmDniqO0hG6Z5X5olfduqQ=
github.com/flyteorg/stow v0.3.7 h1:Cx7j8/Ux6+toD5hp5fy++927V+yAcAttDeQAlUD/864=
github.com/flyteorg/stow v0.3.7/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo=
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
Expand Down Expand Up @@ -876,8 +872,8 @@ google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"fmt"

"github.com/flyteorg/flytestdlib/config"
"github.com/flyteorg/flyte/flytestdlib/config"
)

const SectionKey = "application"
Expand Down
6 changes: 3 additions & 3 deletions datacatalog/pkg/manager/impl/artifact_data_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package impl
import (
"context"

"github.com/flyteorg/datacatalog/pkg/errors"
"github.com/flyteorg/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flytestdlib/storage"
"github.com/flyteorg/flyte/flytestdlib/storage"
"google.golang.org/grpc/codes"
)

Expand Down
24 changes: 12 additions & 12 deletions datacatalog/pkg/manager/impl/artifact_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ import (
"strconv"
"time"

"github.com/flyteorg/datacatalog/pkg/errors"
"github.com/flyteorg/datacatalog/pkg/manager/impl/validators"
"github.com/flyteorg/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/datacatalog/pkg/repositories"
"github.com/flyteorg/flyte/datacatalog/pkg/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/manager/impl/validators"
"github.com/flyteorg/flyte/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"

"github.com/flyteorg/datacatalog/pkg/repositories/models"
"github.com/flyteorg/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"

"github.com/flyteorg/datacatalog/pkg/common"
"github.com/flyteorg/flytestdlib/contextutils"
"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flytestdlib/storage"
"github.com/flyteorg/flyte/datacatalog/pkg/common"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/storage"
"google.golang.org/grpc/codes"
)

Expand Down
18 changes: 9 additions & 9 deletions datacatalog/pkg/manager/impl/artifact_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import (

"fmt"

"github.com/flyteorg/datacatalog/pkg/common"
"github.com/flyteorg/datacatalog/pkg/errors"
repoErrors "github.com/flyteorg/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/common"
"github.com/flyteorg/flyte/datacatalog/pkg/errors"
repoErrors "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flytestdlib/contextutils"
mockScope "github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flytestdlib/storage"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
mockScope "github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/storage"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/stretchr/testify/assert"
Expand Down
20 changes: 10 additions & 10 deletions datacatalog/pkg/manager/impl/dataset_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import (
"strconv"
"time"

"github.com/flyteorg/datacatalog/pkg/common"
"github.com/flyteorg/datacatalog/pkg/errors"
"github.com/flyteorg/datacatalog/pkg/manager/impl/validators"
"github.com/flyteorg/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/datacatalog/pkg/repositories"
"github.com/flyteorg/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyte/datacatalog/pkg/common"
"github.com/flyteorg/flyte/datacatalog/pkg/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/manager/impl/validators"
"github.com/flyteorg/flyte/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flytestdlib/storage"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/storage"
"google.golang.org/grpc/codes"
)

Expand Down
16 changes: 8 additions & 8 deletions datacatalog/pkg/manager/impl/dataset_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (

"context"

"github.com/flyteorg/datacatalog/pkg/common"
"github.com/flyteorg/datacatalog/pkg/errors"
"github.com/flyteorg/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/datacatalog/pkg/repositories/models"
"github.com/flyteorg/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyte/datacatalog/pkg/common"
"github.com/flyteorg/flyte/datacatalog/pkg/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flytestdlib/contextutils"
mockScope "github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
mockScope "github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
18 changes: 9 additions & 9 deletions datacatalog/pkg/manager/impl/reservation_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import (
"context"
"time"

"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"

"github.com/flyteorg/datacatalog/pkg/errors"
"github.com/flyteorg/datacatalog/pkg/repositories"
repo_errors "github.com/flyteorg/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/datacatalog/pkg/repositories/models"
"github.com/flyteorg/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyte/datacatalog/pkg/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories"
repo_errors "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"

"github.com/flyteorg/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/flyte/datacatalog/pkg/manager/interfaces"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
)
Expand Down
10 changes: 5 additions & 5 deletions datacatalog/pkg/manager/impl/reservation_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"context"
"fmt"

mockScope "github.com/flyteorg/flytestdlib/promutils"
mockScope "github.com/flyteorg/flyte/flytestdlib/promutils"

"testing"
"time"

errors2 "github.com/flyteorg/datacatalog/pkg/errors"
errors3 "github.com/flyteorg/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/datacatalog/pkg/repositories/models"
errors2 "github.com/flyteorg/flyte/datacatalog/pkg/errors"
errors3 "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/golang/protobuf/ptypes"
"github.com/stretchr/testify/assert"
Expand Down
22 changes: 11 additions & 11 deletions datacatalog/pkg/manager/impl/tag_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ import (
"context"
"time"

"github.com/flyteorg/datacatalog/pkg/manager/impl/validators"
"github.com/flyteorg/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/datacatalog/pkg/repositories"
"github.com/flyteorg/flyte/datacatalog/pkg/manager/impl/validators"
"github.com/flyteorg/flyte/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories"

"github.com/flyteorg/datacatalog/pkg/repositories/models"
"github.com/flyteorg/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"

"github.com/flyteorg/datacatalog/pkg/errors"
"github.com/flyteorg/flytestdlib/contextutils"
"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flytestdlib/storage"
"github.com/flyteorg/flyte/datacatalog/pkg/errors"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/storage"
)

type tagMetrics struct {
Expand Down
10 changes: 5 additions & 5 deletions datacatalog/pkg/manager/impl/tag_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"context"
"testing"

"github.com/flyteorg/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/mocks"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"

"github.com/flyteorg/flytestdlib/contextutils"
mockScope "github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
mockScope "github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc/codes"
Expand Down
Loading