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 ci checks fix lint #4032

Merged
merged 6 commits into from
Sep 13, 2023
Merged

Monorepo ci checks fix lint #4032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ad13c8
Fix flyteplugins lint errors
eapolinario Sep 13, 2023
b163c4b
Fix datacatalog lint errors
eapolinario Sep 13, 2023
ce66968
Fix flyteadmin lint errors
eapolinario Sep 13, 2023
a2c00ec
Fix flyteaidl lint errors
eapolinario Sep 13, 2023
37f0ae3
Fix flytepropeller lint errors
eapolinario Sep 13, 2023
d06e6a1
Comment flytecopilot lint and flyteidl unit tests
eapolinario Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
- flyteadmin
# TODO(monorepo): Enable lint flytecopilot
# - flytecopilot
- flytecopilot
- flyteidl
- flyteplugins
- flytepropeller
Expand All @@ -51,8 +50,7 @@ jobs:
- flyteadmin
- flytecopilot
# TODO(monorepo): Enable flyteidl unit tests
# flyteidl
- flyteidl
# - flyteidl
- flyteplugins
- flytepropeller
- flytestdlib
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -5,9 +5,9 @@ import (

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

Expand Down
4 changes: 2 additions & 2 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 @@ -14,12 +14,12 @@ import (
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/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/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/pkg/manager/impl/dataset_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"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/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyte/flytestdlib/storage"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"google.golang.org/grpc/codes"
)

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -10,10 +10,10 @@ import (
"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/flyte/flytestdlib/contextutils"
mockScope "github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/pkg/repositories/gormimpl/artifact_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/utils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"google.golang.org/grpc/codes"
)

Expand Down
2 changes: 1 addition & 1 deletion datacatalog/pkg/repositories/gormimpl/dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/utils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/pkg/repositories/transformers/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/flyteorg/flyte/datacatalog/pkg/manager/impl/validators"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/gormimpl"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/pkg/rpc/datacatalogservice/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
"github.com/flyteorg/flyte/datacatalog/pkg/manager/interfaces"
"github.com/flyteorg/flyte/datacatalog/pkg/repositories"
"github.com/flyteorg/flyte/datacatalog/pkg/runtime"
catalog "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
"github.com/flyteorg/flyte/flytestdlib/contextutils"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyte/flytestdlib/storage"
catalog "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
)

type DataCatalogService struct {
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/auth/auth_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"time"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"

"github.com/coreos/go-oidc"
"github.com/flyteorg/flyte/flyteadmin/auth/config"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/auth/authzserver/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"fmt"
"time"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"

"k8s.io/apimachinery/pkg/util/sets"

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/auth/cookie_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"net/http"
"time"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
"github.com/flyteorg/flyte/flytestdlib/errors"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
"golang.org/x/oauth2"

"github.com/flyteorg/flyte/flyteadmin/auth/config"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/auth/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"time"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
"github.com/flyteorg/flyte/flytestdlib/errors"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
"golang.org/x/oauth2"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/auth/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks"
"github.com/flyteorg/flyte/flyteadmin/pkg/common"
"github.com/flyteorg/flyte/flyteadmin/plugins"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
stdConfig "github.com/flyteorg/flyte/flytestdlib/config"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/cmd/scheduler/entrypoints/precheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/flyteorg/flyteidl/clients/go/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/clients/go/admin"

"github.com/spf13/cobra"
"google.golang.org/grpc/health/grpc_health_v1"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/dataproxy/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/common"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"

"github.com/flyteorg/flyte/flyteadmin/pkg/errors"
"google.golang.org/grpc/codes"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/events/implementations/node_execution_event_writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/async/events/interfaces"
"github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
)

// This event writer acts to asynchronously persist node execution events. As flytepropeller sends node
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/async/events/interfaces"
"github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
)

// This event writer acts to asynchronously persist workflow execution events. As flytepropeller sends workflow
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/implementations"
runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/aws_emailer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces"
"github.com/flyteorg/flyte/flyteadmin/pkg/errors"
runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"google.golang.org/grpc/codes"
)

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/aws_emailer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/aws/aws-sdk-go/service/ses/sesiface"
"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks"
runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/aws_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/NYTimes/gizmo/pubsub"
"github.com/flyteorg/flyte/flyteadmin/pkg/async"
"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/golang/protobuf/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/gcp_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/NYTimes/gizmo/pubsub"
"github.com/flyteorg/flyte/flyteadmin/pkg/async"
"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/golang/protobuf/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/gcp_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/NYTimes/gizmo/pubsub/pubsubtest"
"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/pkg/errors"
dto "github.com/prometheus/client_model/go"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/noop_notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"

"strings"

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/publisher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/NYTimes/gizmo/pubsub/pubsubtest"
"github.com/aws/aws-sdk-go/aws"
"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/sandbox_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/async"
"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/golang/protobuf/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces"
runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
)

type SendgridEmailer struct {
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
scheduleInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces"
"github.com/flyteorg/flyte/flyteadmin/pkg/errors"
appInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/aws/mocks"
scheduleInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces"
flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors"
"github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flytestdlib/promutils"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/cloudwatchevents"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/schedule/aws/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"hash/fnv"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
)

func hashIdentifier(identifier core.Identifier) uint64 {
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/schedule/aws/workflow_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/NYTimes/gizmo/pubsub/aws"
"github.com/flyteorg/flyte/flyteadmin/pkg/errors"
"github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"google.golang.org/grpc/codes"
)

Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/async/schedule/noop/event_scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces"
runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flytestdlib/logger"
)

type EventScheduler struct{}
Expand Down
4 changes: 2 additions & 2 deletions flyteadmin/pkg/clusterresource/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ import (
errors2 "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors"
"github.com/flyteorg/flyte/flyteadmin/pkg/runtime"
runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
admin2 "github.com/flyteorg/flyteidl/clients/go/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flytestdlib/logger"
"github.com/flyteorg/flyte/flytestdlib/promutils"
admin2 "github.com/flyteorg/flyteidl/clients/go/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
)

const namespaceVariable = "namespace"
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/pkg/clusterresource/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/flyteorg/flyte/flyteadmin/pkg/clusterresource/mocks"
execClusterMocks "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/mocks"
runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
mockScope "github.com/flyteorg/flyte/flytestdlib/promutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
Loading