From 73d98d12ea17e72dde228f4f146077e3cac483bd Mon Sep 17 00:00:00 2001 From: Eduardo Apolinario <653394+eapolinario@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:22:22 -0700 Subject: [PATCH] [Monorepo] - Proclaim monorepo (#4014) * Add go replace directives Signed-off-by: Eduardo Apolinario * Rename modules and add go replace directives Signed-off-by: Eduardo Apolinario * Rename imports in datacatalog Signed-off-by: Eduardo Apolinario * Rename imports in flyteadmin Signed-off-by: Eduardo Apolinario * Rename imports in flytecopilot Signed-off-by: Eduardo Apolinario * Rename imports in flyteplugins Signed-off-by: Eduardo Apolinario * Rename imports in flytepropeller Signed-off-by: Eduardo Apolinario * Rename imports in flytestdlib Signed-off-by: Eduardo Apolinario * Import flyteidl and add necessary go replace directives Signed-off-by: Eduardo Apolinario * Fix flytecopilot references Signed-off-by: Eduardo Apolinario * Run make helm Signed-off-by: Eduardo Apolinario * Monorepo build images (#4027) * Add dockerfiles Signed-off-by: Eduardo Apolinario * Build component using reusable workflow Signed-off-by: Eduardo Apolinario * Add "Components checks" workflow Signed-off-by: Eduardo Apolinario * Fix typo Signed-off-by: Eduardo Apolinario * Rename gh workflow Signed-off-by: Eduardo Apolinario * Use the correct dockerfile Signed-off-by: Eduardo Apolinario * Enable endtoend tests Signed-off-by: Eduardo Apolinario * Use correct path to end2end reusable workflow Signed-off-by: Eduardo Apolinario * Use unique prefixes for the cache Signed-off-by: Eduardo Apolinario * Use tmp/tmp Signed-off-by: Eduardo Apolinario * Be more explicit about the path components docker images are saved to Signed-off-by: Eduardo Apolinario * Test only overriding datacatalog image Signed-off-by: Eduardo Apolinario * Comment out actual helm upgrades (i.e. simply run tests) Signed-off-by: Eduardo Apolinario * Comment out end2end and bring integration tests Signed-off-by: Eduardo Apolinario * Fix typo in definition of priorities Signed-off-by: Eduardo Apolinario * Hardcode go version to 1.19 Signed-off-by: Eduardo Apolinario * Use correct working directory in integration.yml Signed-off-by: Eduardo Apolinario * Enable flytepropeller integration tests Signed-off-by: Eduardo Apolinario * Unpack envvars prior to calling reusable workflow Signed-off-by: Eduardo Apolinario * Enable go_generate.yml Signed-off-by: Eduardo Apolinario * Enable push_docker_image Signed-off-by: Eduardo Apolinario * Fix flytecopilot go generate Signed-off-by: Eduardo Apolinario * Fix image tags Signed-off-by: Eduardo Apolinario * Enable lint and unit tests Signed-off-by: Eduardo Apolinario * Pass component to lint and unit-tests jobs Signed-off-by: Eduardo Apolinario * Fix flytestdlib unit test Signed-off-by: Eduardo Apolinario * Fix flyteplugins test Signed-off-by: Eduardo Apolinario * Build flytescheduler image Signed-off-by: Eduardo Apolinario * Monorepo ci checks fix lint (#4032) * Fix flyteplugins lint errors Signed-off-by: Eduardo Apolinario * Fix datacatalog lint errors Signed-off-by: Eduardo Apolinario * Fix flyteadmin lint errors Signed-off-by: Eduardo Apolinario * Fix flyteaidl lint errors Signed-off-by: Eduardo Apolinario * Fix flytepropeller lint errors Signed-off-by: Eduardo Apolinario * Comment flytecopilot lint and flyteidl unit tests Signed-off-by: Eduardo Apolinario --------- Signed-off-by: Eduardo Apolinario Co-authored-by: Eduardo Apolinario --------- Signed-off-by: Eduardo Apolinario Co-authored-by: Eduardo Apolinario * [Monorepo] - Fix single binary (#4015) * Fix single-binary Signed-off-by: Eduardo Apolinario * Fix flyteplugins references in single-binary Signed-off-by: Eduardo Apolinario * Point to local flyteidl in single-binary Signed-off-by: Eduardo Apolinario * Fix flytecopilot references Signed-off-by: Eduardo Apolinario --------- Signed-off-by: Eduardo Apolinario Co-authored-by: Eduardo Apolinario * Run make generate in flytepropeller Signed-off-by: Eduardo Apolinario * Build sandbox-lite using monorepo Signed-off-by: Eduardo Apolinario * Comment out push_docker_image step Signed-off-by: Eduardo Apolinario --------- Signed-off-by: Eduardo Apolinario Co-authored-by: Eduardo Apolinario --- .github/workflows/checks.yml | 161 ++++++ .github/workflows/component_docker_build.yml | 49 ++ .github/workflows/end2end.yml | 134 +++++ .github/workflows/go_generate.yml | 27 + .github/workflows/integration.yml | 52 ++ .github/workflows/lint.yml | 27 + .github/workflows/lite-image-manual.yml | 2 +- .github/workflows/publish.yml | 68 +++ .github/workflows/sandbox.yml | 2 +- .github/workflows/unit-tests.yml | 41 ++ Dockerfile | 9 + Dockerfile.datacatalog | 53 ++ Dockerfile.flyteadmin | 53 ++ Dockerfile.flytecopilot | 39 ++ Dockerfile.flytepropeller | 42 ++ Dockerfile.flytescheduler | 47 ++ .../Dockerfile => Dockerfile.sandbox-lite | 9 + cmd/main.go | 2 +- cmd/single/config.go | 8 +- cmd/single/root.go | 6 +- cmd/single/secret.go | 2 +- cmd/single/start.go | 44 +- .../flyte/golang_support_tools/tools.go | 2 +- datacatalog/cmd/entrypoints/migrate.go | 2 +- datacatalog/cmd/entrypoints/root.go | 6 +- datacatalog/cmd/entrypoints/serve.go | 14 +- datacatalog/cmd/entrypoints/serve_dummy.go | 6 +- datacatalog/cmd/main.go | 2 +- datacatalog/go.mod | 15 +- datacatalog/go.sum | 6 +- datacatalog/pkg/config/config.go | 2 +- .../pkg/manager/impl/artifact_data_store.go | 6 +- .../pkg/manager/impl/artifact_manager.go | 24 +- .../pkg/manager/impl/artifact_manager_test.go | 18 +- .../pkg/manager/impl/dataset_manager.go | 20 +- .../pkg/manager/impl/dataset_manager_test.go | 16 +- .../pkg/manager/impl/reservation_manager.go | 18 +- .../manager/impl/reservation_manager_test.go | 10 +- datacatalog/pkg/manager/impl/tag_manager.go | 22 +- .../pkg/manager/impl/tag_manager_test.go | 10 +- .../impl/validators/artifact_validator.go | 2 +- .../impl/validators/dataset_validator.go | 2 +- .../pkg/manager/impl/validators/errors.go | 4 +- .../impl/validators/pagination_validator.go | 2 +- .../impl/validators/partition_validator.go | 2 +- .../pkg/repositories/config/postgres.go | 6 +- .../pkg/repositories/config/postgres_test.go | 6 +- datacatalog/pkg/repositories/errors/errors.go | 4 +- .../pkg/repositories/errors/postgres.go | 4 +- datacatalog/pkg/repositories/factory.go | 10 +- .../pkg/repositories/gormimpl/artifact.go | 10 +- .../repositories/gormimpl/artifact_test.go | 16 +- .../pkg/repositories/gormimpl/dataset.go | 12 +- .../pkg/repositories/gormimpl/dataset_test.go | 16 +- .../pkg/repositories/gormimpl/filter.go | 6 +- .../pkg/repositories/gormimpl/filter_test.go | 2 +- datacatalog/pkg/repositories/gormimpl/join.go | 6 +- .../pkg/repositories/gormimpl/join_test.go | 2 +- datacatalog/pkg/repositories/gormimpl/list.go | 8 +- .../pkg/repositories/gormimpl/list_test.go | 6 +- .../pkg/repositories/gormimpl/metrics.go | 4 +- .../pkg/repositories/gormimpl/reservation.go | 10 +- .../repositories/gormimpl/reservation_test.go | 10 +- datacatalog/pkg/repositories/gormimpl/sort.go | 2 +- datacatalog/pkg/repositories/gormimpl/tag.go | 8 +- .../pkg/repositories/gormimpl/tag_test.go | 16 +- datacatalog/pkg/repositories/handle.go | 10 +- datacatalog/pkg/repositories/handle_test.go | 6 +- datacatalog/pkg/repositories/initialize.go | 8 +- .../repositories/interfaces/artifact_repo.go | 2 +- .../repositories/interfaces/dataset_repo.go | 2 +- .../repositories/interfaces/partition_repo.go | 2 +- .../interfaces/reservation_repo.go | 2 +- .../pkg/repositories/interfaces/tag_repo.go | 2 +- .../pkg/repositories/mocks/artifact_repo.go | 2 +- datacatalog/pkg/repositories/mocks/base.go | 2 +- .../pkg/repositories/mocks/dataset_repo.go | 2 +- .../pkg/repositories/mocks/partition_repo.go | 2 +- .../repositories/mocks/reservation_repo.go | 2 +- .../pkg/repositories/mocks/tag_repo.go | 2 +- datacatalog/pkg/repositories/models/list.go | 2 +- datacatalog/pkg/repositories/postgres_repo.go | 8 +- .../pkg/repositories/transformers/artifact.go | 4 +- .../transformers/artifact_test.go | 2 +- .../pkg/repositories/transformers/dataset.go | 2 +- .../repositories/transformers/dataset_test.go | 2 +- .../pkg/repositories/transformers/filters.go | 10 +- .../repositories/transformers/filters_test.go | 4 +- .../repositories/transformers/pagination.go | 8 +- .../transformers/pagination_test.go | 4 +- .../repositories/transformers/partition.go | 2 +- .../repositories/transformers/reservation.go | 4 +- .../transformers/reservation_test.go | 2 +- .../pkg/repositories/transformers/tag.go | 2 +- .../pkg/repositories/transformers/tag_test.go | 2 +- .../pkg/repositories/transformers/util.go | 2 +- .../pkg/rpc/datacatalogservice/service.go | 18 +- .../runtime/application_config_provider.go | 8 +- .../runtime/configs/data_catalog_config.go | 2 +- flyteadmin/Makefile | 1 + flyteadmin/auth/auth_context.go | 10 +- flyteadmin/auth/authzserver/authorize.go | 6 +- flyteadmin/auth/authzserver/authorize_test.go | 8 +- .../auth/authzserver/claims_verifier.go | 4 +- flyteadmin/auth/authzserver/initialize.go | 2 +- .../auth/authzserver/initialize_test.go | 4 +- flyteadmin/auth/authzserver/metadata.go | 8 +- .../auth/authzserver/metadata_provider.go | 4 +- .../authzserver/metadata_provider_test.go | 6 +- flyteadmin/auth/authzserver/metadata_test.go | 4 +- flyteadmin/auth/authzserver/provider.go | 10 +- flyteadmin/auth/authzserver/provider_test.go | 6 +- .../auth/authzserver/resource_server.go | 6 +- .../auth/authzserver/resource_server_test.go | 6 +- .../auth/authzserver/stateless_token_store.go | 4 +- flyteadmin/auth/authzserver/token.go | 4 +- flyteadmin/auth/authzserver/token_test.go | 4 +- flyteadmin/auth/authzserver/utils.go | 4 +- flyteadmin/auth/config/config.go | 2 +- flyteadmin/auth/config/config_test.go | 6 +- flyteadmin/auth/constants.go | 2 +- flyteadmin/auth/cookie.go | 6 +- flyteadmin/auth/cookie_manager.go | 6 +- flyteadmin/auth/cookie_manager_test.go | 2 +- flyteadmin/auth/cookie_test.go | 6 +- flyteadmin/auth/create_secrets.go | 14 +- flyteadmin/auth/handler_utils.go | 2 +- flyteadmin/auth/handler_utils_test.go | 4 +- flyteadmin/auth/handlers.go | 10 +- flyteadmin/auth/handlers_test.go | 12 +- flyteadmin/auth/identity_context.go | 2 +- flyteadmin/auth/init_secrets.go | 4 +- flyteadmin/auth/interceptor.go | 2 +- flyteadmin/auth/interfaces/context.go | 2 +- .../mocks/authentication_context.go | 4 +- .../auth/interfaces/mocks/o_auth2_provider.go | 2 +- .../mocks/o_auth2_resource_server.go | 2 +- flyteadmin/auth/token.go | 6 +- .../flyte/golang_support_tools/tools.go | 2 +- flyteadmin/cmd/entrypoints/clusterresource.go | 8 +- flyteadmin/cmd/entrypoints/k8s_secret.go | 2 +- flyteadmin/cmd/entrypoints/migrate.go | 2 +- flyteadmin/cmd/entrypoints/root.go | 8 +- flyteadmin/cmd/entrypoints/serve.go | 10 +- flyteadmin/cmd/main.go | 4 +- .../cmd/scheduler/entrypoints/precheck.go | 2 +- flyteadmin/cmd/scheduler/entrypoints/root.go | 6 +- .../cmd/scheduler/entrypoints/scheduler.go | 10 +- flyteadmin/cmd/scheduler/main.go | 2 +- flyteadmin/dataproxy/service.go | 14 +- flyteadmin/dataproxy/service_test.go | 18 +- flyteadmin/go.mod | 42 +- flyteadmin/go.sum | 49 +- flyteadmin/pkg/async/cloudevent/factory.go | 16 +- .../pkg/async/cloudevent/factory_test.go | 8 +- .../implementations/cloudevent_publisher.go | 8 +- .../cloudevent_publisher_test.go | 2 +- .../cloudevent/implementations/sender.go | 2 +- .../node_execution_event_writer.go | 8 +- .../node_execution_event_writer_test.go | 2 +- .../workflow_execution_event_writer.go | 8 +- .../workflow_execution_event_writer_test.go | 2 +- flyteadmin/pkg/async/notifications/email.go | 2 +- .../pkg/async/notifications/email_test.go | 2 +- flyteadmin/pkg/async/notifications/factory.go | 14 +- .../pkg/async/notifications/factory_test.go | 6 +- .../implementations/aws_emailer.go | 10 +- .../implementations/aws_emailer_test.go | 6 +- .../implementations/aws_processor.go | 8 +- .../implementations/aws_processor_test.go | 2 +- .../implementations/email_metrics.go | 2 +- .../implementations/event_publisher.go | 6 +- .../implementations/event_publisher_test.go | 2 +- .../implementations/gcp_processor.go | 8 +- .../implementations/gcp_processor_test.go | 4 +- .../implementations/noop_notifications.go | 4 +- .../implementations/processor_metrics.go | 2 +- .../implementations/publisher.go | 6 +- .../implementations/publisher_test.go | 4 +- .../implementations/sandbox_processor.go | 6 +- .../implementations/sandbox_processor_test.go | 2 +- .../implementations/sandbox_publisher.go | 2 +- .../implementations/sendgrid_emailer.go | 8 +- .../implementations/sendgrid_emailer_test.go | 4 +- .../schedule/aws/cloud_watch_scheduler.go | 12 +- .../aws/cloud_watch_scheduler_test.go | 10 +- .../mocks/mock_cloud_watch_event_client.go | 2 +- .../pkg/async/schedule/aws/serialization.go | 4 +- .../async/schedule/aws/serialization_test.go | 2 +- flyteadmin/pkg/async/schedule/aws/shared.go | 2 +- .../async/schedule/aws/workflow_executor.go | 20 +- .../schedule/aws/workflow_executor_test.go | 12 +- flyteadmin/pkg/async/schedule/factory.go | 22 +- .../schedule/interfaces/event_scheduler.go | 2 +- .../schedule/mocks/mock_event_scheduler.go | 6 +- .../async/schedule/noop/event_scheduler.go | 6 +- .../async/schedule/noop/workflow_executor.go | 2 +- flyteadmin/pkg/async/shared.go | 2 +- flyteadmin/pkg/clusterresource/controller.go | 30 +- .../pkg/clusterresource/controller_test.go | 10 +- .../impl/admin_service_data_provider.go | 6 +- .../impl/db_admin_data_provider.go | 12 +- .../impl/db_admin_data_provider_test.go | 14 +- flyteadmin/pkg/clusterresource/impl/shared.go | 2 +- flyteadmin/pkg/common/constants.go | 2 +- flyteadmin/pkg/common/data_store.go | 8 +- flyteadmin/pkg/common/data_store_test.go | 6 +- flyteadmin/pkg/common/filters.go | 4 +- flyteadmin/pkg/common/mocks/storage.go | 2 +- flyteadmin/pkg/common/sorting.go | 2 +- flyteadmin/pkg/config/config.go | 4 +- flyteadmin/pkg/data/factory.go | 10 +- .../data/implementations/aws_remote_url.go | 8 +- .../data/implementations/gcp_remote_url.go | 8 +- .../data/implementations/noop_remote_url.go | 6 +- .../implementations/noop_remote_url_test.go | 4 +- flyteadmin/pkg/data/mocks/remote.go | 2 +- flyteadmin/pkg/errors/errors.go | 2 +- .../pkg/executioncluster/execution_target.go | 4 +- .../impl/cluster_execution_target_provider.go | 10 +- .../pkg/executioncluster/impl/factory.go | 8 +- .../pkg/executioncluster/impl/in_cluster.go | 6 +- .../executioncluster/impl/in_cluster_test.go | 2 +- .../pkg/executioncluster/impl/list_targets.go | 6 +- .../impl/list_targets_test.go | 8 +- .../impl/random_cluster_selector.go | 18 +- .../impl/random_cluster_selector_test.go | 20 +- .../executioncluster/interfaces/cluster.go | 2 +- .../interfaces/execution_target_provider.go | 4 +- .../mocks/cluster_interface.go | 2 +- .../mocks/execution_target_provider.go | 4 +- .../mocks/get_target_interface.go | 2 +- .../mocks/list_targets_interface.go | 2 +- .../executioncluster/mocks/mock_cluster.go | 2 +- flyteadmin/pkg/flytek8s/client.go | 8 +- .../impl/description_entity_manager.go | 24 +- .../impl/description_entity_manager_test.go | 12 +- .../pkg/manager/impl/execution_manager.go | 52 +- .../manager/impl/execution_manager_test.go | 52 +- .../impl/executions/quality_of_service.go | 8 +- .../executions/quality_of_service_test.go | 12 +- .../pkg/manager/impl/executions/queues.go | 10 +- .../manager/impl/executions/queues_test.go | 12 +- .../pkg/manager/impl/launch_plan_manager.go | 26 +- .../manager/impl/launch_plan_manager_test.go | 24 +- .../pkg/manager/impl/metrics_manager.go | 6 +- .../pkg/manager/impl/metrics_manager_test.go | 4 +- .../pkg/manager/impl/named_entity_manager.go | 24 +- .../manager/impl/named_entity_manager_test.go | 14 +- .../manager/impl/node_execution_manager.go | 38 +- .../impl/node_execution_manager_test.go | 28 +- .../pkg/manager/impl/project_manager.go | 18 +- .../pkg/manager/impl/project_manager_test.go | 14 +- .../impl/resources/resource_manager.go | 20 +- .../impl/resources/resource_manager_test.go | 18 +- flyteadmin/pkg/manager/impl/shared/errors.go | 2 +- flyteadmin/pkg/manager/impl/signal_manager.go | 24 +- .../pkg/manager/impl/signal_manager_test.go | 8 +- .../manager/impl/task_execution_manager.go | 34 +- .../impl/task_execution_manager_test.go | 24 +- flyteadmin/pkg/manager/impl/task_manager.go | 30 +- .../pkg/manager/impl/task_manager_test.go | 24 +- .../pkg/manager/impl/testutils/config.go | 6 +- .../pkg/manager/impl/testutils/repository.go | 6 +- flyteadmin/pkg/manager/impl/util/data.go | 10 +- flyteadmin/pkg/manager/impl/util/data_test.go | 10 +- flyteadmin/pkg/manager/impl/util/digests.go | 6 +- flyteadmin/pkg/manager/impl/util/filters.go | 10 +- .../pkg/manager/impl/util/filters_test.go | 6 +- flyteadmin/pkg/manager/impl/util/resources.go | 8 +- .../pkg/manager/impl/util/resources_test.go | 10 +- flyteadmin/pkg/manager/impl/util/shared.go | 20 +- .../pkg/manager/impl/util/shared_test.go | 20 +- .../impl/util/single_task_execution.go | 16 +- .../impl/util/single_task_execution_test.go | 14 +- .../impl/validation/attributes_validator.go | 8 +- .../validation/attributes_validator_test.go | 6 +- .../impl/validation/execution_validator.go | 10 +- .../validation/execution_validator_test.go | 2 +- .../impl/validation/launch_plan_validator.go | 12 +- .../validation/launch_plan_validator_test.go | 2 +- .../impl/validation/named_entity_validator.go | 4 +- .../validation/named_entity_validator_test.go | 2 +- .../validation/node_execution_validator.go | 4 +- .../validation/notifications_validator.go | 4 +- .../impl/validation/project_validator.go | 8 +- .../impl/validation/project_validator_test.go | 8 +- .../impl/validation/shared_execution.go | 8 +- .../impl/validation/shared_execution_test.go | 10 +- .../impl/validation/signal_validator.go | 10 +- .../impl/validation/signal_validator_test.go | 4 +- .../validation/task_execution_validator.go | 4 +- .../manager/impl/validation/task_validator.go | 18 +- .../impl/validation/task_validator_test.go | 8 +- .../pkg/manager/impl/validation/validation.go | 8 +- .../impl/validation/validation_test.go | 6 +- .../impl/validation/workflow_validator.go | 12 +- .../validation/workflow_validator_test.go | 6 +- .../pkg/manager/impl/version_manager.go | 4 +- .../pkg/manager/impl/version_manager_test.go | 2 +- .../pkg/manager/impl/workflow_manager.go | 32 +- .../pkg/manager/impl/workflow_manager_test.go | 32 +- flyteadmin/pkg/manager/mocks/launch_plan.go | 2 +- flyteadmin/pkg/manager/mocks/resource.go | 2 +- .../repositories/config/migration_models.go | 2 +- .../pkg/repositories/config/migrations.go | 6 +- .../pkg/repositories/config/seed_data.go | 4 +- flyteadmin/pkg/repositories/database.go | 4 +- .../repositories/database_integration_test.go | 4 +- flyteadmin/pkg/repositories/database_test.go | 6 +- .../repositories/errors/error_transformer.go | 2 +- flyteadmin/pkg/repositories/errors/errors.go | 2 +- .../pkg/repositories/errors/postgres.go | 6 +- .../pkg/repositories/errors/postgres_test.go | 2 +- .../errors/test_error_transformer.go | 2 +- flyteadmin/pkg/repositories/gorm_repo.go | 12 +- .../pkg/repositories/gormimpl/common.go | 8 +- .../gormimpl/description_entity_repo.go | 10 +- .../gormimpl/description_entity_repo_test.go | 8 +- .../gormimpl/execution_event_repo.go | 8 +- .../gormimpl/execution_event_repo_test.go | 6 +- .../repositories/gormimpl/execution_repo.go | 10 +- .../gormimpl/execution_repo_test.go | 10 +- .../repositories/gormimpl/launch_plan_repo.go | 10 +- .../gormimpl/launch_plan_repo_test.go | 10 +- .../pkg/repositories/gormimpl/metrics.go | 2 +- .../gormimpl/named_entity_repo.go | 12 +- .../gormimpl/named_entity_repo_test.go | 10 +- .../gormimpl/node_execution_event_repo.go | 8 +- .../node_execution_event_repo_test.go | 6 +- .../gormimpl/node_execution_repo.go | 8 +- .../gormimpl/node_execution_repo_test.go | 12 +- .../pkg/repositories/gormimpl/project_repo.go | 10 +- .../gormimpl/project_repo_test.go | 10 +- .../repositories/gormimpl/resource_repo.go | 10 +- .../gormimpl/resource_repo_test.go | 8 +- .../pkg/repositories/gormimpl/signal_repo.go | 10 +- .../repositories/gormimpl/signal_repo_test.go | 10 +- .../gormimpl/task_execution_repo.go | 8 +- .../gormimpl/task_execution_repo_test.go | 10 +- .../pkg/repositories/gormimpl/task_repo.go | 8 +- .../repositories/gormimpl/task_repo_test.go | 10 +- .../repositories/gormimpl/utils_for_test.go | 2 +- .../repositories/gormimpl/workflow_repo.go | 8 +- .../gormimpl/workflow_repo_test.go | 10 +- .../pkg/repositories/interfaces/common.go | 2 +- .../interfaces/description_entity.go | 2 +- .../interfaces/execution_event_repo.go | 2 +- .../repositories/interfaces/execution_repo.go | 2 +- .../interfaces/launch_plan_repo.go | 2 +- .../interfaces/named_entity_repo.go | 2 +- .../interfaces/node_execution_event_repo.go | 2 +- .../interfaces/node_execution_repo.go | 2 +- .../repositories/interfaces/project_repo.go | 2 +- .../pkg/repositories/interfaces/repository.go | 2 +- .../repositories/interfaces/resource_repo.go | 2 +- .../repositories/interfaces/signal_repo.go | 2 +- .../interfaces/task_execution_repo.go | 2 +- .../pkg/repositories/interfaces/task_repo.go | 2 +- .../repositories/interfaces/workflow_repo.go | 2 +- .../mocks/description_entity_repo.go | 4 +- .../mocks/execution_event_repo_interface.go | 2 +- .../pkg/repositories/mocks/execution_repo.go | 4 +- .../repositories/mocks/launch_plan_repo.go | 4 +- .../mocks/named_entity_metadata_repo.go | 4 +- .../node_execution_event_repo_interface.go | 2 +- .../repositories/mocks/node_execution_repo.go | 4 +- .../pkg/repositories/mocks/project_repo.go | 4 +- .../pkg/repositories/mocks/repository.go | 6 +- flyteadmin/pkg/repositories/mocks/resource.go | 4 +- .../mocks/signal_repo_interface.go | 4 +- .../repositories/mocks/task_execution_repo.go | 4 +- .../pkg/repositories/mocks/task_repo.go | 4 +- .../pkg/repositories/mocks/workflow_repo.go | 4 +- .../pkg/repositories/models/execution.go | 2 +- .../transformers/description_entity.go | 6 +- .../transformers/description_entity_test.go | 2 +- .../repositories/transformers/execution.go | 12 +- .../transformers/execution_event.go | 4 +- .../transformers/execution_event_test.go | 2 +- .../transformers/execution_test.go | 14 +- .../repositories/transformers/init_test.go | 4 +- .../repositories/transformers/launch_plan.go | 4 +- .../transformers/launch_plan_test.go | 4 +- .../repositories/transformers/named_entity.go | 2 +- .../transformers/named_entity_test.go | 2 +- .../transformers/node_execution.go | 14 +- .../transformers/node_execution_event.go | 4 +- .../transformers/node_execution_event_test.go | 2 +- .../transformers/node_execution_test.go | 14 +- .../pkg/repositories/transformers/project.go | 2 +- .../repositories/transformers/project_test.go | 2 +- .../pkg/repositories/transformers/resource.go | 8 +- .../transformers/resource_test.go | 8 +- .../pkg/repositories/transformers/signal.go | 4 +- .../repositories/transformers/signal_test.go | 2 +- .../pkg/repositories/transformers/task.go | 4 +- .../transformers/task_execution.go | 12 +- .../transformers/task_execution_test.go | 10 +- .../repositories/transformers/task_test.go | 4 +- .../pkg/repositories/transformers/workflow.go | 4 +- .../transformers/workflow_test.go | 4 +- flyteadmin/pkg/rpc/adminservice/attributes.go | 2 +- flyteadmin/pkg/rpc/adminservice/base.go | 36 +- flyteadmin/pkg/rpc/adminservice/base_test.go | 4 +- .../rpc/adminservice/description_entity.go | 4 +- flyteadmin/pkg/rpc/adminservice/execution.go | 2 +- .../pkg/rpc/adminservice/launch_plan.go | 4 +- flyteadmin/pkg/rpc/adminservice/metrics.go | 4 +- .../pkg/rpc/adminservice/named_entity.go | 2 +- .../pkg/rpc/adminservice/node_execution.go | 4 +- flyteadmin/pkg/rpc/adminservice/project.go | 2 +- flyteadmin/pkg/rpc/adminservice/task.go | 4 +- .../pkg/rpc/adminservice/task_execution.go | 6 +- .../rpc/adminservice/tests/execution_test.go | 6 +- .../adminservice/tests/launch_plan_test.go | 4 +- .../adminservice/tests/node_execution_test.go | 4 +- .../adminservice/tests/project_domain_test.go | 2 +- .../rpc/adminservice/tests/project_test.go | 2 +- .../adminservice/tests/task_execution_test.go | 4 +- .../pkg/rpc/adminservice/tests/task_test.go | 4 +- flyteadmin/pkg/rpc/adminservice/tests/util.go | 6 +- .../rpc/adminservice/tests/workflow_test.go | 4 +- .../pkg/rpc/adminservice/util/metrics.go | 4 +- .../pkg/rpc/adminservice/util/transformers.go | 4 +- .../adminservice/util/transformers_test.go | 6 +- flyteadmin/pkg/rpc/adminservice/workflow.go | 4 +- flyteadmin/pkg/rpc/signal_service.go | 16 +- flyteadmin/pkg/rpc/signal_service_test.go | 4 +- .../runtime/application_config_provider.go | 10 +- .../pkg/runtime/cluster_config_provider.go | 6 +- .../cluster_pool_assignment_provider.go | 4 +- .../pkg/runtime/cluster_resource_provider.go | 4 +- .../runtime/cluster_resource_provider_test.go | 4 +- .../pkg/runtime/config_provider_test.go | 4 +- .../pkg/runtime/configuration_provider.go | 2 +- .../pkg/runtime/execution_queue_provider.go | 4 +- .../interfaces/application_configuration.go | 4 +- .../interfaces/cluster_configuration.go | 2 +- .../cluster_resource_configuration.go | 2 +- .../cluster_pool_assignment_configuration.go | 2 +- .../quality_of_service_configuration.go | 2 +- .../runtime/mocks/cluster_configuration.go | 2 +- .../mocks/mock_application_provider.go | 4 +- .../mocks/mock_cluster_resource_provider.go | 2 +- .../mocks/mock_configuration_provider.go | 4 +- .../mocks/mock_execution_queue_provider.go | 2 +- .../mock_registration_validation_provider.go | 2 +- .../mocks/mock_task_resource_provider.go | 2 +- .../runtime/mocks/mock_whitelist_provider.go | 2 +- .../pkg/runtime/namespace_config_provider.go | 6 +- .../runtime/quality_of_service_provider.go | 4 +- .../registration_validation_provider.go | 4 +- .../pkg/runtime/task_resource_provider.go | 4 +- flyteadmin/pkg/runtime/whitelist_provider.go | 4 +- flyteadmin/pkg/server/cert_utils.go | 4 +- flyteadmin/pkg/server/initialize.go | 8 +- flyteadmin/pkg/server/service.go | 36 +- .../pkg/workflowengine/impl/compiler.go | 8 +- .../workflowengine/impl/interface_provider.go | 6 +- .../impl/interface_provider_test.go | 4 +- .../pkg/workflowengine/impl/k8s_executor.go | 14 +- .../workflowengine/impl/k8s_executor_test.go | 20 +- .../workflowengine/impl/prepare_execution.go | 6 +- .../impl/prepare_execution_test.go | 6 +- .../workflowengine/impl/workflow_builder.go | 8 +- .../pkg/workflowengine/interfaces/builder.go | 2 +- .../pkg/workflowengine/interfaces/compiler.go | 4 +- .../pkg/workflowengine/interfaces/executor.go | 4 +- .../mocks/flyte_workflow_builder.go | 2 +- .../pkg/workflowengine/mocks/mock_compiler.go | 6 +- .../workflowengine/mocks/workflow_executor.go | 2 +- flyteadmin/scheduler/core/gocron_job.go | 6 +- flyteadmin/scheduler/core/gocron_scheduler.go | 12 +- .../scheduler/core/gocron_scheduler_test.go | 12 +- flyteadmin/scheduler/core/scheduler.go | 4 +- flyteadmin/scheduler/core/snapshot_runner.go | 2 +- flyteadmin/scheduler/core/updater.go | 4 +- .../scheduler/dbapi/event_scheduler_impl.go | 12 +- .../dbapi/event_scheduler_impl_test.go | 8 +- flyteadmin/scheduler/executor/executor.go | 2 +- .../scheduler/executor/executor_impl.go | 8 +- .../scheduler/executor/executor_impl_test.go | 6 +- .../scheduler/executor/mocks/executor.go | 2 +- flyteadmin/scheduler/identifier/identifier.go | 4 +- .../repositories/gormimpl/metrics.go | 2 +- .../gormimpl/schedulable_entity_repo.go | 8 +- .../schedule_entities_snapshot_repo.go | 8 +- .../interfaces/schedulable_entity_repo.go | 2 +- .../schedule_entities_snapshot_repo.go | 2 +- .../schedulable_entity_repo_interface.go | 2 +- ...edule_entities_snap_shot_repo_interface.go | 2 +- .../repositories/models/schedulable_entity.go | 2 +- .../models/schedule_entities_snapshot.go | 2 +- flyteadmin/scheduler/schedule_executor.go | 18 +- .../scheduler/schedule_executor_test.go | 16 +- flyteadmin/scheduler/snapshoter/snapshoter.go | 10 +- .../scheduler/snapshoter/snapshoter_test.go | 14 +- flyteadmin/scheduler/start.go | 10 +- flyteadmin/tests/attributes_test.go | 2 +- flyteadmin/tests/bootstrap.go | 8 +- flyteadmin/tests/execution_test.go | 4 +- flyteadmin/tests/scheduler_test.go | 14 +- flyteadmin/tests/shared.go | 2 +- flyteadmin/tests/task_execution_test.go | 12 +- flyteadmin/tests/task_test.go | 2 +- flyteadmin/tests/workflow_test.go | 2 +- .../flyte/golang_support_tools/tools.go | 2 +- .../golang_test_targets/download_tooling.sh | 3 +- .../cmd/containerwatcher/file_watcher.go | 2 +- .../cmd/containerwatcher/kubeapi_watcher.go | 2 +- .../cmd/containerwatcher/noop_watcher.go | 2 +- .../cmd/containerwatcher/spns_watcher.go | 2 +- flytecopilot/cmd/download.go | 6 +- flytecopilot/cmd/download_test.go | 4 +- flytecopilot/cmd/root.go | 16 +- flytecopilot/cmd/sidecar.go | 8 +- flytecopilot/cmd/sidecar_test.go | 6 +- flytecopilot/data/common.go | 2 +- flytecopilot/data/download.go | 6 +- flytecopilot/data/upload.go | 6 +- flytecopilot/data/upload_test.go | 4 +- flytecopilot/data/utils.go | 4 +- flytecopilot/data/utils_test.go | 6 +- flytecopilot/go.mod | 70 ++- flytecopilot/go.sum | 276 +++------- flytecopilot/main.go | 2 +- .../flyte/golang_support_tools/tools.go | 2 +- .../clients/go/admin/atomic_credentials.go | 2 +- flyteidl/clients/go/admin/auth_interceptor.go | 2 +- .../clients/go/admin/auth_interceptor_test.go | 4 +- flyteidl/clients/go/admin/client.go | 2 +- flyteidl/clients/go/admin/client_test.go | 4 +- flyteidl/clients/go/admin/config.go | 4 +- .../clients/go/admin/deviceflow/config.go | 2 +- .../go/admin/deviceflow/token_orchestrator.go | 2 +- .../deviceflow/token_orchestrator_test.go | 2 +- flyteidl/clients/go/admin/integration_test.go | 2 +- .../go/admin/pkce/auth_flow_orchestrator.go | 2 +- flyteidl/clients/go/admin/pkce/config.go | 2 +- .../clients/go/admin/token_source_provider.go | 2 +- .../base_token_orchestrator.go | 4 +- .../base_token_orchestrator_test.go | 2 +- flyteidl/clients/go/coreutils/literals.go | 2 +- .../clients/go/coreutils/literals_test.go | 2 +- flyteidl/go.mod | 101 ++-- flyteidl/go.sum | 495 +++++------------- .../flyte/golang_support_tools/tools.go | 2 +- flyteplugins/go.mod | 61 ++- flyteplugins/go.sum | 213 ++------ flyteplugins/go/tasks/aws/client.go | 4 +- flyteplugins/go/tasks/aws/config.go | 4 +- flyteplugins/go/tasks/config/config.go | 2 +- flyteplugins/go/tasks/config_load_test.go | 12 +- flyteplugins/go/tasks/errors/errors.go | 2 +- flyteplugins/go/tasks/logs/config.go | 4 +- flyteplugins/go/tasks/logs/logging_utils.go | 4 +- .../go/tasks/logs/logging_utils_test.go | 2 +- .../tasks/pluginmachinery/bundle/fail_fast.go | 6 +- .../pluginmachinery/bundle/fail_fast_test.go | 4 +- .../pluginmachinery/catalog/async_client.go | 6 +- .../catalog/async_client_impl.go | 8 +- .../catalog/async_client_impl_test.go | 8 +- .../tasks/pluginmachinery/catalog/client.go | 2 +- .../pluginmachinery/catalog/client_test.go | 2 +- .../tasks/pluginmachinery/catalog/config.go | 4 +- .../tasks/pluginmachinery/catalog/hashing.go | 2 +- .../catalog/mocks/async_client.go | 2 +- .../pluginmachinery/catalog/mocks/client.go | 4 +- .../catalog/mocks/download_future.go | 2 +- .../catalog/mocks/download_response.go | 2 +- .../pluginmachinery/catalog/mocks/future.go | 2 +- .../catalog/mocks/upload_future.go | 2 +- .../catalog/reader_processor.go | 8 +- .../tasks/pluginmachinery/catalog/response.go | 4 +- .../catalog/writer_processor.go | 8 +- .../pluginmachinery/core/exec_context.go | 6 +- .../core/mocks/events_recorder.go | 2 +- .../pluginmachinery/core/mocks/plugin.go | 2 +- .../core/mocks/resource_manager.go | 2 +- .../core/mocks/resource_negotiator.go | 2 +- .../core/mocks/resource_registrar.go | 2 +- .../core/mocks/setup_context.go | 4 +- .../core/mocks/task_execution_context.go | 8 +- .../core/mocks/task_execution_metadata.go | 2 +- .../pluginmachinery/core/mocks/task_reader.go | 2 +- .../core/mocks/task_template_path.go | 2 +- .../tasks/pluginmachinery/core/plugin_test.go | 4 +- .../pluginmachinery/core/setup_context.go | 2 +- .../pluginmachinery/core/template/template.go | 6 +- .../core/template/template_test.go | 4 +- .../pluginmachinery/flytek8s/config/config.go | 4 +- .../flytek8s/container_helper.go | 10 +- .../flytek8s/container_helper_test.go | 10 +- .../tasks/pluginmachinery/flytek8s/copilot.go | 10 +- .../pluginmachinery/flytek8s/copilot_test.go | 10 +- .../flytek8s/k8s_resource_adds.go | 6 +- .../flytek8s/k8s_resource_adds_test.go | 6 +- .../pluginmachinery/flytek8s/pod_helper.go | 12 +- .../flytek8s/pod_helper_test.go | 18 +- .../flytek8s/pod_template_store.go | 2 +- .../tasks/pluginmachinery/flytek8s/utils.go | 2 +- .../pluginmachinery/flytek8s/utils_test.go | 2 +- ..._workload_identity_token_source_factory.go | 2 +- .../internal/webapi/allocation_token.go | 6 +- .../internal/webapi/allocation_token_test.go | 14 +- .../pluginmachinery/internal/webapi/cache.go | 14 +- .../internal/webapi/cache_test.go | 14 +- .../pluginmachinery/internal/webapi/core.go | 12 +- .../internal/webapi/core_test.go | 6 +- .../internal/webapi/launcher.go | 8 +- .../internal/webapi/launcher_test.go | 8 +- .../internal/webapi/metrics.go | 4 +- .../internal/webapi/mocks/client.go | 4 +- .../internal/webapi/monitor.go | 8 +- .../internal/webapi/monitor_test.go | 10 +- .../internal/webapi/plugin_context.go | 2 +- .../pluginmachinery/internal/webapi/state.go | 2 +- .../go/tasks/pluginmachinery/io/iface.go | 2 +- .../io/mocks/checkpoint_paths.go | 2 +- .../io/mocks/input_file_paths.go | 2 +- .../pluginmachinery/io/mocks/input_reader.go | 2 +- .../io/mocks/output_data_sandbox.go | 2 +- .../io/mocks/output_file_paths.go | 2 +- .../pluginmachinery/io/mocks/output_reader.go | 2 +- .../pluginmachinery/io/mocks/output_writer.go | 4 +- .../io/mocks/raw_output_paths.go | 2 +- .../ioutils/buffered_output_writer.go | 2 +- .../ioutils/cached_input_reader.go | 2 +- .../ioutils/in_memory_output_reader.go | 4 +- .../ioutils/in_memory_output_reader_test.go | 2 +- .../go/tasks/pluginmachinery/ioutils/paths.go | 4 +- .../pluginmachinery/ioutils/paths_test.go | 2 +- .../ioutils/raw_output_path.go | 4 +- .../ioutils/raw_output_path_test.go | 2 +- .../ioutils/remote_file_input_reader.go | 6 +- .../ioutils/remote_file_input_reader_test.go | 2 +- .../ioutils/remote_file_output_reader.go | 4 +- .../ioutils/remote_file_output_reader_test.go | 11 +- .../ioutils/remote_file_output_writer.go | 4 +- .../ioutils/remote_file_output_writer_test.go | 4 +- .../pluginmachinery/ioutils/task_reader.go | 6 +- .../ioutils/task_reader_test.go | 10 +- .../go/tasks/pluginmachinery/k8s/client.go | 2 +- .../k8s/mocks/client_builder.go | 2 +- .../tasks/pluginmachinery/k8s/mocks/plugin.go | 4 +- .../k8s/mocks/plugin_abort_override.go | 4 +- .../k8s/mocks/plugin_context.go | 6 +- .../go/tasks/pluginmachinery/k8s/plugin.go | 6 +- .../go/tasks/pluginmachinery/registry.go | 10 +- .../go/tasks/pluginmachinery/utils/dns.go | 2 +- .../utils/secrets/marshaler.go | 2 +- .../pluginmachinery/webapi/example/config.go | 8 +- .../webapi/example/config_test.go | 4 +- .../pluginmachinery/webapi/example/plugin.go | 10 +- .../webapi/mocks/async_plugin.go | 4 +- .../webapi/mocks/plugin_setup_context.go | 2 +- .../pluginmachinery/webapi/mocks/resource.go | 2 +- .../webapi/mocks/status_context.go | 6 +- .../webapi/mocks/sync_plugin.go | 4 +- .../webapi/mocks/task_execution_context.go | 6 +- .../mocks/task_execution_context_reader.go | 4 +- .../go/tasks/pluginmachinery/webapi/plugin.go | 8 +- .../pluginmachinery/webapi/pluginconfig.go | 4 +- .../workqueue/mocks/indexed_work_queue.go | 2 +- .../workqueue/mocks/processor.go | 2 +- .../workqueue/mocks/work_item_info.go | 2 +- .../tasks/pluginmachinery/workqueue/queue.go | 8 +- .../pluginmachinery/workqueue/queue_test.go | 4 +- .../tasks/plugins/array/array_tests_base.go | 6 +- .../tasks/plugins/array/arraystatus/status.go | 4 +- .../plugins/array/arraystatus/status_test.go | 4 +- .../go/tasks/plugins/array/awsbatch/client.go | 8 +- .../plugins/array/awsbatch/client_test.go | 10 +- .../plugins/array/awsbatch/config/config.go | 6 +- .../tasks/plugins/array/awsbatch/executor.go | 22 +- .../array/awsbatch/executor_metrics.go | 4 +- .../plugins/array/awsbatch/executor_test.go | 28 +- .../plugins/array/awsbatch/job_definition.go | 18 +- .../array/awsbatch/job_definition_test.go | 12 +- .../plugins/array/awsbatch/jobs_store.go | 10 +- .../plugins/array/awsbatch/jobs_store_test.go | 14 +- .../tasks/plugins/array/awsbatch/launcher.go | 14 +- .../plugins/array/awsbatch/launcher_test.go | 22 +- .../plugins/array/awsbatch/mocks/cache.go | 2 +- .../tasks/plugins/array/awsbatch/monitor.go | 22 +- .../plugins/array/awsbatch/monitor_test.go | 26 +- .../go/tasks/plugins/array/awsbatch/state.go | 4 +- .../plugins/array/awsbatch/task_links.go | 10 +- .../plugins/array/awsbatch/transformer.go | 14 +- .../array/awsbatch/transformer_test.go | 12 +- .../go/tasks/plugins/array/catalog.go | 18 +- .../go/tasks/plugins/array/catalog_test.go | 28 +- .../go/tasks/plugins/array/core/metadata.go | 4 +- .../tasks/plugins/array/core/metadata_test.go | 6 +- .../go/tasks/plugins/array/core/state.go | 12 +- .../go/tasks/plugins/array/core/state_test.go | 6 +- flyteplugins/go/tasks/plugins/array/inputs.go | 6 +- .../go/tasks/plugins/array/inputs_test.go | 6 +- .../go/tasks/plugins/array/k8s/config.go | 6 +- .../go/tasks/plugins/array/k8s/executor.go | 16 +- .../plugins/array/k8s/integration_test.go | 20 +- .../go/tasks/plugins/array/k8s/management.go | 26 +- .../plugins/array/k8s/management_test.go | 31 +- .../go/tasks/plugins/array/k8s/subtask.go | 22 +- .../plugins/array/k8s/subtask_exec_context.go | 20 +- .../array/k8s/subtask_exec_context_test.go | 6 +- .../go/tasks/plugins/array/outputs.go | 20 +- .../go/tasks/plugins/array/outputs_test.go | 26 +- .../go/tasks/plugins/array/subtask_phase.go | 8 +- .../go/tasks/plugins/awsutils/awsutils.go | 2 +- .../hive/client/mocks/qubole_client.go | 2 +- .../plugins/hive/client/qubole_client.go | 6 +- .../plugins/hive/client/qubole_client_test.go | 2 +- .../plugins/hive/client/qubole_status.go | 2 +- .../go/tasks/plugins/hive/config/config.go | 6 +- .../go/tasks/plugins/hive/execution_state.go | 20 +- .../plugins/hive/execution_state_test.go | 24 +- .../go/tasks/plugins/hive/executions_cache.go | 16 +- .../plugins/hive/executions_cache_test.go | 14 +- .../go/tasks/plugins/hive/executor.go | 18 +- .../go/tasks/plugins/hive/executor_metrics.go | 4 +- .../go/tasks/plugins/hive/test_helpers.go | 10 +- .../go/tasks/plugins/k8s/dask/dask.go | 20 +- .../go/tasks/plugins/k8s/dask/dask_test.go | 14 +- .../k8s/kfoperators/common/common_operator.go | 12 +- .../common/common_operator_test.go | 6 +- .../plugins/k8s/kfoperators/common/config.go | 4 +- .../tasks/plugins/k8s/kfoperators/mpi/mpi.go | 14 +- .../plugins/k8s/kfoperators/mpi/mpi_test.go | 14 +- .../k8s/kfoperators/pytorch/pytorch.go | 14 +- .../k8s/kfoperators/pytorch/pytorch_test.go | 16 +- .../k8s/kfoperators/tensorflow/tensorflow.go | 14 +- .../kfoperators/tensorflow/tensorflow_test.go | 16 +- .../tasks/plugins/k8s/pod/container_test.go | 10 +- .../go/tasks/plugins/k8s/pod/plugin.go | 20 +- .../go/tasks/plugins/k8s/pod/sidecar_test.go | 14 +- .../go/tasks/plugins/k8s/ray/config.go | 4 +- .../go/tasks/plugins/k8s/ray/config_test.go | 2 +- flyteplugins/go/tasks/plugins/k8s/ray/ray.go | 14 +- .../go/tasks/plugins/k8s/ray/ray_test.go | 14 +- .../plugins/k8s/sagemaker/builtin_training.go | 18 +- .../k8s/sagemaker/builtin_training_test.go | 12 +- .../plugins/k8s/sagemaker/config/config.go | 2 +- .../plugins/k8s/sagemaker/custom_training.go | 16 +- .../k8s/sagemaker/custom_training_test.go | 10 +- .../k8s/sagemaker/hyperparameter_tuning.go | 18 +- .../sagemaker/hyperparameter_tuning_test.go | 8 +- .../go/tasks/plugins/k8s/sagemaker/outputs.go | 4 +- .../go/tasks/plugins/k8s/sagemaker/plugin.go | 8 +- .../plugins/k8s/sagemaker/plugin_test.go | 8 +- .../k8s/sagemaker/plugin_test_utils.go | 14 +- .../go/tasks/plugins/k8s/sagemaker/utils.go | 14 +- .../tasks/plugins/k8s/sagemaker/utils_test.go | 10 +- .../go/tasks/plugins/k8s/spark/config.go | 4 +- .../go/tasks/plugins/k8s/spark/spark.go | 20 +- .../go/tasks/plugins/k8s/spark/spark_test.go | 14 +- .../presto/client/mocks/presto_client.go | 2 +- .../presto/client/noop_presto_client.go | 2 +- .../go/tasks/plugins/presto/config/config.go | 6 +- .../tasks/plugins/presto/execution_state.go | 18 +- .../plugins/presto/execution_state_test.go | 20 +- .../tasks/plugins/presto/executions_cache.go | 14 +- .../plugins/presto/executions_cache_test.go | 14 +- .../go/tasks/plugins/presto/executor.go | 16 +- .../tasks/plugins/presto/executor_metrics.go | 4 +- .../go/tasks/plugins/presto/helpers_test.go | 10 +- .../go/tasks/plugins/webapi/agent/config.go | 8 +- .../tasks/plugins/webapi/agent/config_test.go | 2 +- .../plugins/webapi/agent/integration_test.go | 24 +- .../go/tasks/plugins/webapi/agent/plugin.go | 16 +- .../tasks/plugins/webapi/agent/plugin_test.go | 8 +- .../go/tasks/plugins/webapi/athena/config.go | 8 +- .../go/tasks/plugins/webapi/athena/plugin.go | 16 +- .../go/tasks/plugins/webapi/athena/utils.go | 12 +- .../tasks/plugins/webapi/athena/utils_test.go | 12 +- .../tasks/plugins/webapi/bigquery/config.go | 10 +- .../webapi/bigquery/integration_test.go | 16 +- .../tasks/plugins/webapi/bigquery/plugin.go | 20 +- .../plugins/webapi/bigquery/plugin_test.go | 20 +- .../plugins/webapi/bigquery/query_job.go | 4 +- .../tasks/plugins/webapi/databricks/config.go | 8 +- .../webapi/databricks/integration_test.go | 16 +- .../tasks/plugins/webapi/databricks/plugin.go | 28 +- .../plugins/webapi/databricks/plugin_test.go | 6 +- .../tasks/plugins/webapi/snowflake/config.go | 8 +- .../webapi/snowflake/integration_test.go | 14 +- .../tasks/plugins/webapi/snowflake/plugin.go | 24 +- .../plugins/webapi/snowflake/plugin_test.go | 6 +- flyteplugins/tests/end_to_end.go | 18 +- .../flyte/golang_support_tools/tools.go | 2 +- .../cmd/controller/cmd/init_certs.go | 6 +- flytepropeller/cmd/controller/cmd/root.go | 26 +- flytepropeller/cmd/controller/cmd/webhook.go | 24 +- flytepropeller/cmd/controller/main.go | 4 +- .../cmd/kubectl-flyte/cmd/compile.go | 6 +- .../cmd/kubectl-flyte/cmd/create.go | 10 +- .../cmd/kubectl-flyte/cmd/create_test.go | 6 +- .../cmd/kubectl-flyte/cmd/delete.go | 2 +- flytepropeller/cmd/kubectl-flyte/cmd/get.go | 6 +- .../cmd/kubectl-flyte/cmd/printers/node.go | 6 +- .../kubectl-flyte/cmd/printers/workflow.go | 4 +- flytepropeller/cmd/kubectl-flyte/cmd/root.go | 8 +- .../cmd/kubectl-flyte/cmd/visualize.go | 2 +- flytepropeller/cmd/kubectl-flyte/main.go | 6 +- flytepropeller/cmd/manager/cmd/root.go | 24 +- flytepropeller/cmd/manager/main.go | 2 +- flytepropeller/events/admin_eventsink.go | 8 +- .../admin_eventsink_integration_test.go | 16 +- flytepropeller/events/admin_eventsink_test.go | 4 +- flytepropeller/events/config.go | 4 +- flytepropeller/events/errors/errors.go | 2 +- flytepropeller/events/event_recorder.go | 6 +- flytepropeller/events/event_recorder_test.go | 8 +- flytepropeller/events/local_writer.go | 2 +- .../events/mocks/node_event_recorder.go | 2 +- .../events/mocks/task_event_recorder.go | 2 +- .../events/mocks/workflow_event_recorder.go | 2 +- flytepropeller/events/node_event_recorder.go | 8 +- .../events/node_event_recorder_test.go | 6 +- flytepropeller/events/task_event_recorder.go | 8 +- .../events/task_event_recorder_test.go | 6 +- flytepropeller/events/test_utils.go | 2 +- .../events/workflow_event_recorder.go | 8 +- .../events/workflow_event_recorder_test.go | 6 +- flytepropeller/go.mod | 18 +- flytepropeller/go.sum | 6 - flytepropeller/manager/config/config.go | 2 +- flytepropeller/manager/manager.go | 18 +- flytepropeller/manager/manager_test.go | 6 +- .../manager/shardstrategy/environment.go | 2 +- flytepropeller/manager/shardstrategy/hash.go | 4 +- .../manager/shardstrategy/shard_strategy.go | 4 +- .../flyteworkflow/v1alpha1/branch_test.go | 2 +- .../pkg/apis/flyteworkflow/v1alpha1/iface.go | 4 +- .../flyteworkflow/v1alpha1/mocks/BaseNode.go | 2 +- .../v1alpha1/mocks/BaseWorkflow.go | 2 +- .../v1alpha1/mocks/BaseWorkflowWithStatus.go | 2 +- .../v1alpha1/mocks/ExecutableArrayNode.go | 2 +- .../mocks/ExecutableArrayNodeStatus.go | 4 +- .../v1alpha1/mocks/ExecutableBranchNode.go | 2 +- .../mocks/ExecutableBranchNodeStatus.go | 2 +- .../mocks/ExecutableDynamicNodeStatus.go | 2 +- .../v1alpha1/mocks/ExecutableGateNode.go | 2 +- .../mocks/ExecutableGateNodeStatus.go | 2 +- .../v1alpha1/mocks/ExecutableNode.go | 2 +- .../v1alpha1/mocks/ExecutableNodeStatus.go | 4 +- .../v1alpha1/mocks/ExecutableSubWorkflow.go | 2 +- .../mocks/ExecutableSubWorkflowNodeStatus.go | 2 +- .../mocks/ExecutableTaskNodeStatus.go | 6 +- .../v1alpha1/mocks/ExecutableWorkflow.go | 2 +- .../v1alpha1/mocks/ExecutableWorkflowNode.go | 2 +- .../mocks/ExecutableWorkflowNodeStatus.go | 2 +- .../mocks/ExecutableWorkflowStatus.go | 4 +- .../apis/flyteworkflow/v1alpha1/mocks/Meta.go | 2 +- .../v1alpha1/mocks/MetaExtended.go | 2 +- .../v1alpha1/mocks/MutableArrayNodeStatus.go | 4 +- .../v1alpha1/mocks/MutableBranchNodeStatus.go | 2 +- .../mocks/MutableDynamicNodeStatus.go | 2 +- .../v1alpha1/mocks/MutableGateNodeStatus.go | 2 +- .../v1alpha1/mocks/MutableNodeStatus.go | 4 +- .../mocks/MutableSubWorkflowNodeStatus.go | 2 +- .../v1alpha1/mocks/MutableTaskNodeStatus.go | 6 +- .../mocks/MutableWorkflowNodeStatus.go | 2 +- .../v1alpha1/mocks/NodeGetter.go | 2 +- .../v1alpha1/mocks/NodeStatusGetter.go | 2 +- .../v1alpha1/mocks/NodeStatusVisitor.go | 2 +- .../v1alpha1/mocks/SubWorkflowGetter.go | 2 +- .../v1alpha1/mocks/TaskDetailsGetter.go | 2 +- .../v1alpha1/mocks/WorkflowMeta.go | 2 +- .../v1alpha1/mocks/WorkflowMetaExtended.go | 2 +- .../flyteworkflow/v1alpha1/node_status.go | 6 +- .../v1alpha1/node_status_test.go | 2 +- .../apis/flyteworkflow/v1alpha1/register.go | 2 +- .../apis/flyteworkflow/v1alpha1/tasks_test.go | 2 +- .../apis/flyteworkflow/v1alpha1/workflow.go | 2 +- .../flyteworkflow/v1alpha1/workflow_status.go | 4 +- .../flyteworkflow/v1alpha1/workflow_test.go | 2 +- .../client/clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 6 +- .../clientset/versioned/fake/register.go | 16 +- .../clientset/versioned/scheme/register.go | 16 +- .../v1alpha1/fake/fake_flyteworkflow.go | 2 +- .../fake/fake_flyteworkflow_client.go | 2 +- .../flyteworkflow/v1alpha1/flyteworkflow.go | 4 +- .../v1alpha1/flyteworkflow_client.go | 4 +- .../informers/externalversions/factory.go | 6 +- .../flyteworkflow/interface.go | 4 +- .../flyteworkflow/v1alpha1/flyteworkflow.go | 8 +- .../flyteworkflow/v1alpha1/interface.go | 2 +- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../flyteworkflow/v1alpha1/flyteworkflow.go | 2 +- flytepropeller/pkg/compiler/builders.go | 2 +- flytepropeller/pkg/compiler/common/builder.go | 2 +- flytepropeller/pkg/compiler/common/index.go | 2 +- .../pkg/compiler/common/mocks/node.go | 2 +- .../pkg/compiler/common/mocks/node_builder.go | 2 +- .../pkg/compiler/common/mocks/workflow.go | 2 +- .../compiler/common/mocks/workflow_builder.go | 4 +- flytepropeller/pkg/compiler/requirements.go | 4 +- flytepropeller/pkg/compiler/task_compiler.go | 6 +- .../pkg/compiler/task_compiler_test.go | 4 +- .../pkg/compiler/test/compiler_test.go | 10 +- .../transformers/k8s/builder_mock_test.go | 2 +- .../pkg/compiler/transformers/k8s/inputs.go | 6 +- .../pkg/compiler/transformers/k8s/node.go | 8 +- .../compiler/transformers/k8s/node_test.go | 6 +- .../pkg/compiler/transformers/k8s/utils.go | 2 +- .../pkg/compiler/transformers/k8s/workflow.go | 8 +- .../transformers/k8s/workflow_test.go | 4 +- flytepropeller/pkg/compiler/utils.go | 2 +- .../pkg/compiler/validators/bindings.go | 6 +- .../pkg/compiler/validators/bindings_test.go | 6 +- .../pkg/compiler/validators/branch.go | 4 +- .../pkg/compiler/validators/branch_test.go | 4 +- .../pkg/compiler/validators/condition.go | 4 +- .../pkg/compiler/validators/interface.go | 4 +- .../pkg/compiler/validators/interface_test.go | 6 +- .../pkg/compiler/validators/node.go | 4 +- .../pkg/compiler/validators/node_test.go | 6 +- .../pkg/compiler/validators/vars.go | 4 +- .../pkg/compiler/workflow_compiler.go | 6 +- .../pkg/compiler/workflow_compiler_test.go | 12 +- .../pkg/controller/completed_workflows.go | 2 +- .../controller/completed_workflows_test.go | 2 +- .../pkg/controller/composite_workqueue.go | 6 +- .../controller/composite_workqueue_test.go | 6 +- .../pkg/controller/config/config.go | 4 +- flytepropeller/pkg/controller/controller.go | 58 +- .../pkg/controller/controller_test.go | 10 +- .../pkg/controller/executors/dag_structure.go | 2 +- .../controller/executors/execution_context.go | 2 +- .../pkg/controller/executors/kube.go | 4 +- .../pkg/controller/executors/kube_test.go | 6 +- .../executors/mocks/client_builder.go | 2 +- .../mocks/dag_structure_with_start_node.go | 2 +- .../executors/mocks/execution_context.go | 4 +- .../mocks/immutable_execution_context.go | 2 +- .../controller/executors/mocks/node_lookup.go | 2 +- .../executors/mocks/parent_info_getter.go | 2 +- .../executors/mocks/sub_workflow_getter.go | 2 +- .../executors/mocks/task_details_getter.go | 2 +- .../controller/executors/mocks/workflow.go | 2 +- .../pkg/controller/executors/node_lookup.go | 2 +- .../controller/executors/node_lookup_test.go | 4 +- .../pkg/controller/executors/workflow.go | 2 +- .../pkg/controller/garbage_collector.go | 12 +- .../pkg/controller/garbage_collector_test.go | 8 +- flytepropeller/pkg/controller/handler.go | 24 +- flytepropeller/pkg/controller/handler_test.go | 20 +- .../nodes/array/execution_context.go | 4 +- .../pkg/controller/nodes/array/handler.go | 38 +- .../controller/nodes/array/handler_test.go | 42 +- .../nodes/array/node_execution_context.go | 10 +- .../array/node_execution_context_builder.go | 8 +- .../pkg/controller/nodes/array/node_lookup.go | 4 +- .../pkg/controller/nodes/array/utils.go | 12 +- .../pkg/controller/nodes/branch/comparator.go | 2 +- .../pkg/controller/nodes/branch/evaluator.go | 8 +- .../controller/nodes/branch/evaluator_test.go | 8 +- .../pkg/controller/nodes/branch/handler.go | 22 +- .../controller/nodes/branch/handler_test.go | 28 +- flytepropeller/pkg/controller/nodes/cache.go | 26 +- .../pkg/controller/nodes/cache_test.go | 28 +- .../pkg/controller/nodes/catalog/config.go | 6 +- .../nodes/catalog/datacatalog/datacatalog.go | 8 +- .../catalog/datacatalog/datacatalog_test.go | 10 +- .../nodes/catalog/datacatalog/transformer.go | 6 +- .../catalog/datacatalog/transformer_test.go | 2 +- .../controller/nodes/catalog/noop_catalog.go | 4 +- .../pkg/controller/nodes/common/utils.go | 6 +- .../pkg/controller/nodes/common/utils_test.go | 2 +- .../nodes/dynamic/dynamic_workflow.go | 28 +- .../nodes/dynamic/dynamic_workflow_test.go | 24 +- .../pkg/controller/nodes/dynamic/handler.go | 32 +- .../controller/nodes/dynamic/handler_test.go | 30 +- .../nodes/dynamic/mocks/task_node_handler.go | 12 +- .../pkg/controller/nodes/dynamic/utils.go | 6 +- .../controller/nodes/dynamic/utils_test.go | 2 +- .../pkg/controller/nodes/end/handler.go | 12 +- .../pkg/controller/nodes/end/handler_test.go | 22 +- .../pkg/controller/nodes/errors/codes.go | 2 +- .../pkg/controller/nodes/errors/errors.go | 2 +- .../pkg/controller/nodes/executor.go | 44 +- .../pkg/controller/nodes/executor_test.go | 52 +- .../nodes/factory/handler_factory.go | 32 +- .../pkg/controller/nodes/gate/handler.go | 18 +- .../pkg/controller/nodes/gate/handler_test.go | 28 +- .../pkg/controller/nodes/handler/state.go | 8 +- .../controller/nodes/handler/state_test.go | 2 +- .../nodes/handler/transition_info.go | 2 +- .../nodes/handler/transition_test.go | 2 +- .../controller/nodes/interfaces/handler.go | 8 +- .../nodes/interfaces/handler_factory.go | 2 +- .../mocks/cacheable_node_handler.go | 6 +- .../nodes/interfaces/mocks/event_recorder.go | 2 +- .../nodes/interfaces/mocks/handler_factory.go | 4 +- .../controller/nodes/interfaces/mocks/node.go | 6 +- .../mocks/node_execution_context.go | 12 +- .../mocks/node_execution_context_builder.go | 4 +- .../nodes/interfaces/mocks/node_executor.go | 4 +- .../nodes/interfaces/mocks/node_handler.go | 4 +- .../interfaces/mocks/node_state_reader.go | 2 +- .../interfaces/mocks/node_state_writer.go | 2 +- .../nodes/interfaces/mocks/setup_context.go | 2 +- .../pkg/controller/nodes/interfaces/node.go | 4 +- .../nodes/interfaces/node_exec_context.go | 12 +- .../pkg/controller/nodes/interfaces/state.go | 2 +- .../controller/nodes/mocks/output_resolver.go | 4 +- .../pkg/controller/nodes/node_exec_context.go | 28 +- .../nodes/node_exec_context_test.go | 26 +- .../controller/nodes/node_state_manager.go | 6 +- .../pkg/controller/nodes/output_resolver.go | 10 +- .../controller/nodes/output_resolver_test.go | 2 +- .../pkg/controller/nodes/predicate.go | 8 +- .../pkg/controller/nodes/predicate_test.go | 4 +- .../pkg/controller/nodes/resolve.go | 8 +- .../pkg/controller/nodes/resolve_test.go | 12 +- .../pkg/controller/nodes/setup_context.go | 6 +- .../pkg/controller/nodes/start/handler.go | 4 +- .../controller/nodes/start/handler_test.go | 6 +- .../controller/nodes/subworkflow/handler.go | 20 +- .../nodes/subworkflow/handler_test.go | 28 +- .../nodes/subworkflow/launchplan.go | 22 +- .../nodes/subworkflow/launchplan/admin.go | 10 +- .../subworkflow/launchplan/admin_test.go | 6 +- .../subworkflow/launchplan/adminconfig.go | 2 +- .../nodes/subworkflow/launchplan/errors.go | 2 +- .../subworkflow/launchplan/errors_test.go | 2 +- .../subworkflow/launchplan/mocks/executor.go | 2 +- .../launchplan/mocks/flyte_admin.go | 2 +- .../nodes/subworkflow/launchplan/noop.go | 4 +- .../nodes/subworkflow/launchplan_test.go | 26 +- .../nodes/subworkflow/subworkflow.go | 20 +- .../nodes/subworkflow/subworkflow_test.go | 10 +- .../pkg/controller/nodes/subworkflow/util.go | 2 +- .../nodes/task/backoff/controller.go | 4 +- .../controller/nodes/task/backoff/handler.go | 6 +- .../nodes/task/backoff/handler_test.go | 6 +- .../pkg/controller/nodes/task/cache.go | 12 +- .../controller/nodes/task/config/config.go | 4 +- .../controller/nodes/task/event_recorder.go | 2 +- .../nodes/task/event_recorder_test.go | 2 +- .../fakeplugins/next_phase_state_plugin.go | 6 +- .../task/fakeplugins/task_replayer_plugin.go | 2 +- .../nodes/task/future_file_reader.go | 10 +- .../pkg/controller/nodes/task/handler.go | 50 +- .../pkg/controller/nodes/task/handler_test.go | 52 +- .../nodes/task/k8s/plugin_collector.go | 8 +- .../nodes/task/k8s/plugin_collector_test.go | 2 +- .../nodes/task/k8s/plugin_context.go | 10 +- .../nodes/task/k8s/plugin_manager.go | 34 +- .../nodes/task/k8s/plugin_manager_test.go | 26 +- .../nodes/task/k8s/task_exec_context.go | 6 +- .../nodes/task/k8s/task_exec_context_test.go | 2 +- .../controller/nodes/task/plugin_config.go | 12 +- .../nodes/task/plugin_config_test.go | 8 +- .../nodes/task/plugin_state_manager.go | 4 +- .../nodes/task/remote_workflow_store.go | 6 +- .../nodes/task/remote_workflow_store_test.go | 6 +- .../task/resourcemanager/config/config.go | 2 +- .../resourcemanager/noop_resourcemanager.go | 2 +- .../task/resourcemanager/redis_client.go | 4 +- .../resourcemanager/redis_resourcemanager.go | 8 +- .../redis_resourcemanager_test.go | 6 +- .../resourcemanager/resourceconstraints.go | 2 +- .../task/resourcemanager/resourcemanager.go | 4 +- .../resourcemanager/resourcemanager_test.go | 6 +- .../resourcemanager/resourcemanager_util.go | 6 +- .../nodes/task/secretmanager/config.go | 2 +- .../nodes/task/secretmanager/secrets.go | 2 +- .../pkg/controller/nodes/task/setup_ctx.go | 6 +- .../controller/nodes/task/setup_ctx_test.go | 6 +- .../controller/nodes/task/taskexec_context.go | 26 +- .../nodes/task/taskexec_context_test.go | 32 +- .../pkg/controller/nodes/task/transformer.go | 16 +- .../controller/nodes/task/transformer_test.go | 18 +- .../pkg/controller/nodes/task_reader.go | 2 +- .../pkg/controller/nodes/transformers.go | 14 +- .../pkg/controller/nodes/transformers_test.go | 12 +- flytepropeller/pkg/controller/workers.go | 6 +- flytepropeller/pkg/controller/workers_test.go | 4 +- .../pkg/controller/workflow/errors/errors.go | 2 +- .../pkg/controller/workflow/executor.go | 26 +- .../pkg/controller/workflow/executor_test.go | 56 +- .../pkg/controller/workflowstore/config.go | 2 +- .../pkg/controller/workflowstore/factory.go | 6 +- .../pkg/controller/workflowstore/iface.go | 2 +- .../pkg/controller/workflowstore/inmemory.go | 2 +- .../workflowstore/mocks/FlyteWorkflow.go | 5 +- .../controller/workflowstore/passthrough.go | 10 +- .../workflowstore/passthrough_test.go | 8 +- .../workflowstore/resource_version_caching.go | 6 +- .../resource_version_caching_test.go | 10 +- .../workflowstore/terminated_tracking.go | 6 +- .../workflowstore/terminated_tracking_test.go | 6 +- flytepropeller/pkg/controller/workqueue.go | 6 +- .../pkg/controller/workqueue_test.go | 4 +- .../pkg/leaderelection/leader_election.go | 2 +- flytepropeller/pkg/utils/failing_datastore.go | 2 +- .../pkg/utils/failing_datastore_test.go | 2 +- flytepropeller/pkg/utils/k8s.go | 8 +- flytepropeller/pkg/utils/k8s_test.go | 2 +- flytepropeller/pkg/visualize/nodeq.go | 2 +- flytepropeller/pkg/visualize/sort.go | 2 +- flytepropeller/pkg/visualize/visualize.go | 4 +- .../pkg/webhook/aws_secret_manager.go | 4 +- .../pkg/webhook/aws_secret_manager_test.go | 2 +- flytepropeller/pkg/webhook/config/config.go | 2 +- flytepropeller/pkg/webhook/entrypoint.go | 10 +- .../pkg/webhook/gcp_secret_manager.go | 4 +- .../pkg/webhook/gcp_secret_manager_test.go | 2 +- flytepropeller/pkg/webhook/global_secrets.go | 4 +- .../pkg/webhook/global_secrets_test.go | 4 +- flytepropeller/pkg/webhook/init_cert.go | 8 +- flytepropeller/pkg/webhook/k8s_secrets.go | 4 +- .../pkg/webhook/mocks/secrets_injector.go | 2 +- flytepropeller/pkg/webhook/pod.go | 10 +- flytepropeller/pkg/webhook/pod_test.go | 6 +- flytepropeller/pkg/webhook/secrets.go | 10 +- flytepropeller/pkg/webhook/secrets_test.go | 4 +- flytepropeller/pkg/webhook/utils.go | 4 +- .../pkg/webhook/vault_secret_manager.go | 6 +- .../pkg/webhook/vault_secret_manager_test.go | 2 +- flytepropeller/plugins/loader.go | 30 +- .../flyte/golang_support_tools/tools.go | 2 +- flytestdlib/cache/auto_refresh.go | 8 +- .../cache/auto_refresh_example_test.go | 4 +- flytestdlib/cache/auto_refresh_test.go | 6 +- flytestdlib/cache/mocks/AutoRefresh.go | 2 +- flytestdlib/cache/mocks/ItemWrapper.go | 2 +- flytestdlib/cli/pflags/api/generator.go | 2 +- flytestdlib/cli/pflags/api/generator_test.go | 2 +- flytestdlib/cli/pflags/api/sample.go | 2 +- flytestdlib/cli/pflags/cmd/root.go | 4 +- flytestdlib/cli/pflags/cmd/version.go | 2 +- flytestdlib/cli/pflags/main.go | 2 +- flytestdlib/config/regexp_test.go | 2 +- flytestdlib/config/section.go | 2 +- flytestdlib/config/section_test.go | 2 +- flytestdlib/config/tests/accessor_test.go | 4 +- flytestdlib/config/tests/config_cmd_test.go | 2 +- flytestdlib/config/tests/types_test.go | 4 +- flytestdlib/config/url_test.go | 2 +- flytestdlib/config/utils.go | 2 +- flytestdlib/config/viper/collection.go | 4 +- flytestdlib/config/viper/viper.go | 8 +- flytestdlib/database/config.go | 2 +- flytestdlib/database/config_test.go | 6 +- flytestdlib/database/gorm.go | 2 +- flytestdlib/fastcheck/fastcheck_test.go | 6 +- flytestdlib/fastcheck/iface.go | 2 +- flytestdlib/fastcheck/lru.go | 2 +- flytestdlib/fastcheck/oppobloom.go | 2 +- flytestdlib/go.mod | 11 +- flytestdlib/ioutils/timed_readers_test.go | 2 +- flytestdlib/logger/config.go | 2 +- flytestdlib/logger/logger.go | 2 +- flytestdlib/pbhash/pbhash.go | 2 +- flytestdlib/profutils/server.go | 6 +- flytestdlib/profutils/server_test.go | 4 +- flytestdlib/promutils/labeled/counter.go | 4 +- flytestdlib/promutils/labeled/counter_test.go | 4 +- flytestdlib/promutils/labeled/gauge.go | 4 +- flytestdlib/promutils/labeled/gauge_test.go | 4 +- flytestdlib/promutils/labeled/keys.go | 2 +- flytestdlib/promutils/labeled/keys_test.go | 2 +- flytestdlib/promutils/labeled/stopwatch.go | 4 +- .../promutils/labeled/stopwatch_test.go | 4 +- flytestdlib/promutils/labeled/summary.go | 4 +- flytestdlib/promutils/labeled/summary_test.go | 4 +- flytestdlib/random/mocks/comparable.go | 2 +- .../random/mocks/weighted_random_list.go | 2 +- flytestdlib/random/weighted_random_list.go | 2 +- flytestdlib/storage/cached_rawstore.go | 8 +- flytestdlib/storage/cached_rawstore_test.go | 2 +- flytestdlib/storage/config.go | 4 +- flytestdlib/storage/config_test.go | 4 +- flytestdlib/storage/copy_impl.go | 8 +- flytestdlib/storage/copy_impl_test.go | 4 +- flytestdlib/storage/init_test.go | 6 +- .../storage/mocks/composed_protobuf_store.go | 2 +- flytestdlib/storage/mocks/raw_store.go | 2 +- .../storage/mocks/reference_constructor.go | 2 +- flytestdlib/storage/protobuf_store.go | 6 +- flytestdlib/storage/protobuf_store_test.go | 2 +- flytestdlib/storage/rawstores.go | 2 +- flytestdlib/storage/rawstores_test.go | 2 +- flytestdlib/storage/storage_test.go | 2 +- flytestdlib/storage/stow_store.go | 10 +- flytestdlib/storage/stow_store_test.go | 8 +- flytestdlib/storage/url_path.go | 2 +- flytestdlib/storage/utils.go | 4 +- flytestdlib/storage/utils_test.go | 2 +- flytestdlib/tests/config_test.go | 10 +- flytestdlib/utils/auto_refresh_cache.go | 4 +- flytestdlib/utils/marshal_utils_test.go | 2 +- flytestdlib/utils/mocks/auto_refresh_cache.go | 2 +- flytestdlib/utils/rate_limiter.go | 2 +- go.mod | 23 +- go.sum | 12 - 1202 files changed, 5536 insertions(+), 5156 deletions(-) create mode 100644 .github/workflows/checks.yml create mode 100644 .github/workflows/component_docker_build.yml create mode 100644 .github/workflows/end2end.yml create mode 100644 .github/workflows/go_generate.yml create mode 100644 .github/workflows/integration.yml create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/publish.yml create mode 100644 .github/workflows/unit-tests.yml create mode 100644 Dockerfile.datacatalog create mode 100644 Dockerfile.flyteadmin create mode 100644 Dockerfile.flytecopilot create mode 100644 Dockerfile.flytepropeller create mode 100644 Dockerfile.flytescheduler rename docker/sandbox-lite/Dockerfile => Dockerfile.sandbox-lite (93%) mode change 100755 => 100644 flyteplugins/go/tasks/config/config.go mode change 100755 => 100644 flyteplugins/go/tasks/config_load_test.go mode change 100755 => 100644 flyteplugins/go/tasks/errors/errors.go mode change 100755 => 100644 flyteplugins/go/tasks/logs/config.go mode change 100755 => 100644 flyteplugins/go/tasks/logs/logging_utils.go mode change 100755 => 100644 flyteplugins/go/tasks/logs/logging_utils_test.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/config/config.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/utils.go mode change 100755 => 100644 flyteplugins/go/tasks/pluginmachinery/flytek8s/utils_test.go mode change 100755 => 100644 flyteplugins/go/tasks/plugins/k8s/dask/dask.go mode change 100755 => 100644 flyteplugins/go/tasks/plugins/k8s/spark/spark.go mode change 100755 => 100644 flyteplugins/go/tasks/plugins/k8s/spark/spark_test.go mode change 100755 => 100644 flytepropeller/pkg/compiler/builders.go mode change 100755 => 100644 flytepropeller/pkg/compiler/requirements.go mode change 100755 => 100644 flytepropeller/pkg/compiler/utils.go mode change 100755 => 100644 flytepropeller/pkg/compiler/workflow_compiler.go mode change 100755 => 100644 flytepropeller/pkg/compiler/workflow_compiler_test.go diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml new file mode 100644 index 0000000000..bdae826546 --- /dev/null +++ b/.github/workflows/checks.yml @@ -0,0 +1,161 @@ +name: Components Checks + +on: + pull_request: + push: + branches: + - master +env: + GO_VERSION: "1.19" + PRIORITIES: "P0" +jobs: + unpack-envvars: + runs-on: ubuntu-latest + outputs: + go-version: ${{ steps.step.outputs.go-version }} + steps: + - id: step + run: | + echo "go-version=${{ env.GO_VERSION }}" >> $GITHUB_OUTPUT + + lint: + name: Lint + needs: + - unpack-envvars + strategy: + fail-fast: false + matrix: + component: + - datacatalog + - flyteadmin + # TODO(monorepo): Enable lint flytecopilot + # - flytecopilot + - flyteidl + - flyteplugins + - flytepropeller + - flytestdlib + uses: ./.github/workflows/lint.yml + with: + component: ${{ matrix.component }} + go-version: ${{ needs.unpack-envvars.outputs.go-version }} + unit-tests: + name: Unit Tests + needs: + - unpack-envvars + strategy: + fail-fast: false + matrix: + component: + - datacatalog + - flyteadmin + - flytecopilot + # TODO(monorepo): Enable flyteidl unit tests + # - flyteidl + - flyteplugins + - flytepropeller + - flytestdlib + uses: ./.github/workflows/unit-tests.yml + with: + component: ${{ matrix.component }} + go-version: ${{ needs.unpack-envvars.outputs.go-version }} + secrets: + FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} + docker-build: + strategy: + fail-fast: false + matrix: + component: + - datacatalog + - flyteadmin + - flytecopilot + - flytepropeller + name: Docker Build Images + uses: ./.github/workflows/component_docker_build.yml + with: + component: ${{ matrix.component }} + + # TODO(monorepo): these tests are broken. They never test an actual change. + # endtoend: + # name: End2End Test + # needs: [ docker-build ] + # uses: ./.github/workflows/end2end.yml + # with: + # # Reusing the output of the matrix is ok as they are essentially writing the same value (i.e. the directory artifacts are written + run id) + # cache_key: ${{ needs.docker-build.outputs.cache_key }} + # priorities: "P0" + + integration: + name: Integration Test + needs: + - docker-build + - unpack-envvars + strategy: + fail-fast: false + matrix: + component: + - flyteadmin + uses: ./.github/workflows/integration.yml + with: + component: ${{ matrix.component }} + cache_key: ${{ needs.docker-build.outputs.cache_key }} + go-version: ${{ needs.unpack-envvars.outputs.go-version }} + + generate: + name: Check Go Generate + needs: + - unpack-envvars + strategy: + fail-fast: false + matrix: + component: + - datacatalog + - flyteadmin + - flytecopilot + - flytepropeller + uses: ./.github/workflows/go_generate.yml + with: + component: ${{ matrix.component }} + go-version: ${{ needs.unpack-envvars.outputs.go-version }} + + # TODO(monorepo): enable bump_version + # bump_version: + # name: Bump Version + # if: ${{ github.event_name != 'pull_request' }} + # needs: [ endtoend, integration, lint, tests, generate ] # Only to ensure it can successfully build + # uses: flyteorg/flytetools/.github/workflows/bump_version.yml@master + # secrets: + # FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} + + # goreleaser: + # name: Goreleaser + # needs: [ bump_version ] # Only to ensure it can successfully build + # uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@master + # with: + # go-version: "1.19" + # secrets: + # FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} + + # push_docker_image: + # name: Build & Push Image + # # TODO(monorepo): depend on bump_version + # # needs: [ bump_version ] + # strategy: + # fail-fast: false + # matrix: + # component: + # - datacatalog + # - flyteadmin + # - flytecopilot + # - flytepropeller + # - flytescheduler + # uses: ./.github/workflows/publish.yml + # with: + # version: "test-version-monorepo" + # component: ${{ matrix.component }} + # dockerfile: Dockerfile.${{ matrix.component }} + # # TODO(monorepo): set push to true once we depend on bump_version + # # push: true + # push: false + # secrets: + # FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} + # FLYTE_BOT_USERNAME: ${{ secrets.FLYTE_BOT_USERNAME }} diff --git a/.github/workflows/component_docker_build.yml b/.github/workflows/component_docker_build.yml new file mode 100644 index 0000000000..f6ef1ae9d6 --- /dev/null +++ b/.github/workflows/component_docker_build.yml @@ -0,0 +1,49 @@ +name: Build Docker Image + +on: + workflow_call: + inputs: + component: + required: true + type: string + outputs: + cache_key: + description: "Docker Cache key" + value: ${{ jobs.build_docker.outputs.cache_key }} +jobs: + build_docker: + runs-on: ubuntu-latest + outputs: + cache_key: ${{ steps.cache_key.outputs.cache_key }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - id: load-docker-cache + name: Load Docker Cache + uses: actions/cache@v3 + with: + path: /tmp/tmp/docker-images-${{ inputs.component }} + key: /tmp/docker-images-${{ github.run_id }}-${{ inputs.component }} + restore-keys: | + /tmp/docker-images- + - name: Set cache key output + id: cache_key + run: | + echo ::set-output name=cache_key::/tmp/docker-images-${{ github.run_id }} + - name: Prime docker cache + run: (docker load -i /tmp/tmp/docker-images/snapshot-builder.tar || true) && (docker load -i /tmp/tmp/docker-images/snapshot.tar || true) + - name: Build dockerfile + env: + # We are unable to leverage docker buildx here without changing the + # caching mechanism significantly. See here for the caching options + # available for docker buildx: https://docs.docker.com/engine/reference/commandline/buildx_build/#cache-from + # For now at least enable DOCKER_BUILDKIT for faster builds. Eventually we + # should rewrite this pipeline to use docker buildx with cache type=gha. + DOCKER_BUILDKIT: "1" + run: | + docker build -t ${{ github.repository_owner }}/${{ inputs.component }}:builder --target builder --cache-from=${{ github.repository_owner }}/${{ inputs.component }}:builder --file Dockerfile.${{ inputs.component }} . + docker build -t ${{ github.repository_owner }}/${{ inputs.component }}:latest --cache-from=${{ github.repository_owner }}/${{ inputs.component }}:builder --file Dockerfile.${{ inputs.component }} . + + - name: Tag and cache docker image + run: | + mkdir -p /tmp/tmp/docker-images-${{ inputs.component }} && docker save ${{ github.repository_owner }}/${{ inputs.component }}:builder -o /tmp/tmp/docker-images-${{ inputs.component }}/snapshot-builder-${{ inputs.component }}.tar && docker save ${{ github.repository_owner }}/${{ inputs.component }}:latest -o /tmp/tmp/docker-images-${{ inputs.component }}/snapshot-${{ inputs.component }}.tar diff --git a/.github/workflows/end2end.yml b/.github/workflows/end2end.yml new file mode 100644 index 0000000000..ad21cf2cf1 --- /dev/null +++ b/.github/workflows/end2end.yml @@ -0,0 +1,134 @@ +name: End to End tests + +on: + workflow_call: + inputs: + priorities: + description: "Priorities of tests to register (comma-separated)" + required: true + type: string + cache_key: + description: "Cache key for docker image" + required: true + type: string +jobs: + endtoend: + name: End to End tests + runs-on: ubuntu-latest + env: + FLYTESNACKS_VERSION: "" + steps: + - name: Set latest Flytesnacks release + if: ${{ env.FLYTESNACKS_VERSION == '' }} + run: | + FLYTESNACKS_VERSION="$(curl --silent https://api.github.com/repos/flyteorg/flytesnacks/releases/latest | jq -r .tag_name)" + echo "FLYTESNACKS_VERSION=${FLYTESNACKS_VERSION}" >> ${GITHUB_ENV} + - name: Checkout + uses: actions/checkout@v3 + - uses: unionai/flytectl-setup-action@v0.0.1 + name: Setup flytectl + - uses: actions/setup-python@v3 + with: + python-version: 3.11 + - id: load-docker-cache-datacatalog + uses: actions/cache@v3 + with: + path: /tmp/tmp/docker-images-datacatalog + key: ${{ inputs.cache_key }}-datacatalog + - id: load-docker-cache-flyteadmin + uses: actions/cache@v3 + with: + path: /tmp/tmp/docker-images-flyteadmin + key: ${{ inputs.cache_key }}-flyteadmin + - id: load-docker-cache-flytecopilot + uses: actions/cache@v3 + with: + path: /tmp/tmp/docker-images-flytecopilot + key: ${{ inputs.cache_key }}-flytecopilot + - id: load-docker-cache-flytepropeller + uses: actions/cache@v3 + with: + path: /tmp/tmp/docker-images-flytepropeller + key: ${{ inputs.cache_key }}-flytepropeller + - name: Create Sandbox Cluster + run: | + cp /tmp/tmp/docker-images-datacatalog/snapshot-datacatalog.tar snapshot-datacatalog.tar + cp /tmp/tmp/docker-images-flyteadmin/snapshot-flyteadmin.tar snapshot-flyteadmin.tar + cp /tmp/tmp/docker-images-flytecopilot/snapshot-flytecopilot.tar snapshot-flytecopilot.tar + cp /tmp/tmp/docker-images-flytepropeller/snapshot-flytepropeller.tar snapshot-flytepropeller.tar + flytectl config init + flytectl sandbox start --source=$(pwd) + - name: Prime docker cache + run: | + flytectl sandbox exec -- docker load -i /root/snapshot-datacatalog.tar + flytectl sandbox exec -- docker load -i /root/snapshot-flyteadmin.tar + flytectl sandbox exec -- docker load -i /root/snapshot-flytecopilot.tar + flytectl sandbox exec -- docker load -i /root/snapshot-flytepropeller.tar + - name: Setup Flytekit + run: | + python -m pip install --upgrade pip + pip install flytekit flytekitplugins-deck-standard + pip freeze + - name: Checkout flytesnacks + if: ${{ inputs.priorities == 'P0' }} + uses: actions/checkout@v3 + with: + repository: flyteorg/flytesnacks + path: flytesnacks + ref: ${{ env.FLYTESNACKS_VERSION }} + - name: Register P0 tests + if: ${{ inputs.priorities == 'P0' }} + run: | + for f in \ + basics/basics/hello_world.py \ + basics/basics/workflow.py \ + basics/basics/named_outputs.py \ + advanced_composition/advanced_composition/chain_entities.py \ + advanced_composition/advanced_composition/dynamics.py \ + advanced_composition/advanced_composition/map_task.py \ + advanced_composition/advanced_composition/subworkflows.py \ + data_types_and_io/data_types_and_io/custom_objects.py \ + data_types_and_io/data_types_and_io/schema.py \ + data_types_and_io/data_types_and_io/typed_schema.py ; + do + pyflyte --config ./boilerplate/flyte/end2end/functional-test-config.yaml \ + register \ + --project flytesnacks \ + --domain development \ + --image cr.flyte.org/flyteorg/flytekit:py3.11-latest \ + --version ${{ env.FLYTESNACKS_VERSION }} \ + flytesnacks/examples/$f; + done + - name: Register all flytesnacks examples + if: ${{ inputs.priorities != 'P0' }} + uses: unionai/flyte-register-action@v0.0.2 + with: + flytesnacks: true + project: flytesnacks + version: ${{ env.FLYTESNACKS_VERSION }} + domain: development + # - name: Pre Upgrade Tests + # if: ${{ github.event.repository.name == 'flyteadmin' }} + # env: + # PRIORITIES: "${{ inputs.priorities }}" + # run: | + # make end2end_execute + - name: Upgrade Helm charts + run: | + flytectl sandbox exec -- helm repo add flyteorg https://flyteorg.github.io/flyte + flytectl sandbox exec -- helm repo update + flytectl sandbox exec -- helm upgrade flyte -n flyte-core --kubeconfig=/etc/rancher/k3s/k3s.yaml flyteorg/flyte-core -f /flyteorg/share/flyte/values-sandbox.yaml --wait --set datacatalog.image.repository=${{ github.repository_owner }}/datacalog,datacatalog.image.tag=latest + # TODO(monorepo): the following commands are not correct. + # we have to separate the calls to replace the images into different commands. + # flytectl sandbox exec -- helm upgrade flyte -n flyte-core --kubeconfig=/etc/rancher/k3s/k3s.yaml flyteorg/flyte-core -f /flyteorg/share/flyte/values-sandbox.yaml --wait \ + # --set datacatalog.image.repository=${{ github.repository_owner }}/datacalog,datacatalog.image.tag=latest + # --set flyteadmin.image.repository=${{ github.repository_owner }}/datacalog,flyteadmin.image.tag=latest + # --set flytecopilot.image.repository=${{ github.repository_owner }}/datacalog,flytecopilot.image.tag=latest + # --set flytepropeller.image.repository=${{ github.repository_owner }}/datacalog,flytepropeller.image.tag=latest + + flytectl sandbox exec -- k3s kubectl get pods -n flyte -oyaml + - name: Post Upgrade Tests + env: + PRIORITIES: "${{ inputs.priorities }}" + run: | + make end2end_execute diff --git a/.github/workflows/go_generate.yml b/.github/workflows/go_generate.yml new file mode 100644 index 0000000000..79e60e29a0 --- /dev/null +++ b/.github/workflows/go_generate.yml @@ -0,0 +1,27 @@ +name: Go Generate + +on: + workflow_call: + inputs: + component: + required: true + type: string + go-version: + required: true + type: string +jobs: + generate: + runs-on: ubuntu-latest + name: Go Generate + defaults: + run: + working-directory: ${{ inputs.component }} + steps: + - uses: actions/checkout@v3 + - uses: arduino/setup-protoc@v1 + - uses: bufbuild/buf-setup-action@v1 + - uses: actions/setup-go@v3 + with: + go-version: ${{ inputs.go-version }} + - name: Go generate and diff + run: DELTA_CHECK=true make generate diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml new file mode 100644 index 0000000000..ba640f851c --- /dev/null +++ b/.github/workflows/integration.yml @@ -0,0 +1,52 @@ +name: Integration tests + +on: + workflow_call: + inputs: + component: + required: true + type: string + cache_key: + description: "Cache key for docker image" + required: true + type: string + go-version: + required: true + type: string +jobs: + integration: + name: Integration tests + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ inputs.component }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - id: load-docker-cache + name: Load Docker Cache + uses: actions/cache@v3 + with: + path: /tmp/tmp/docker-images-${{ inputs.component }} + key: ${{ inputs.cache_key }}-${{ inputs.component }} + - name: Prime docker cache + run: docker load -i /tmp/tmp/docker-images-${{ inputs.component }}/snapshot-builder-${{ inputs.component }}.tar || true + - uses: engineerd/setup-kind@v0.5.0 + with: + version: "v0.11.1" + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: ${{ inputs.go-version }} + - name: Integration + run: | + # attempt to clean up some unneeded data: https://github.com/actions/virtual-environments/issues/2840#issuecomment-790492173 + sudo rm -rf /usr/share/dotnet + sudo rm -rf /opt/ghc + sudo rm -rf "/usr/local/share/boost" + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + kubectl cluster-info + kubectl get pods -n kube-system + echo "current-context:" $(kubectl config current-context) + echo "environment-kubeconfig:" ${KUBECONFIG} + IMAGE_NAME=${{ inputs.component }} IMAGE=${{ github.repository_owner }}/${{ inputs.component }}:builder make k8s_integration_execute diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000000..5b65cd0736 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,27 @@ +name: Lint + +on: + workflow_call: + inputs: + component: + required: true + type: string + go-version: + required: true + type: string +jobs: + lint: + name: Run Lint + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ inputs.component }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: ${{ inputs.go-version }} + - name: Lint + run: make install && make lint diff --git a/.github/workflows/lite-image-manual.yml b/.github/workflows/lite-image-manual.yml index 00236b465d..8b5831b0e2 100644 --- a/.github/workflows/lite-image-manual.yml +++ b/.github/workflows/lite-image-manual.yml @@ -58,7 +58,7 @@ jobs: target: dind tags: ${{ steps.dind-names.outputs.tags }} build-args: "FLYTE_VERSION=${{ steps.set_version.outputs.flyte_version }}" - file: docker/sandbox-lite/Dockerfile + file: Dockerfile.sandbox-lite cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new - # Temp fix diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000000..3385733b68 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,68 @@ +name: Build & Push Docker Image + +on: + workflow_call: + inputs: + component: + description: "Component Name" + required: true + type: string + dockerfile: + description: "Dockerfile name" + required: true + type: string + version: + description: "Version of image" + required: true + type: string + push: + description: "Push to registry" + required: true + type: boolean + before-build: + description: "Script to run before build" + required: false + type: string + secrets: + FLYTE_BOT_USERNAME: + required: true + FLYTE_BOT_PAT: + required: true +jobs: + push-github: + name: Push to Github Registry + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: '0' + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to GitHub Container Registry + if: ${{ inputs.push }} + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: "${{ secrets.FLYTE_BOT_USERNAME }}" + password: "${{ secrets.FLYTE_BOT_PAT }}" + - name: Prepare Image Tags + id: tags + uses: docker/metadata-action@v3 + with: + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.component }} + tags: | + type=raw,value=latest + type=raw,value=${{ inputs.version }} + type=sha,format=long,prefix= + - name: Before Build + run: ${{ inputs.before-build }} + - name: Build and Push Image + uses: docker/build-push-action@v3 + with: + context: . + file: ${{ inputs.dockerfile }} + platforms: linux/arm64,linux/amd64 + push: ${{ inputs.push }} + tags: ${{ steps.tags.outputs.tags }} diff --git a/.github/workflows/sandbox.yml b/.github/workflows/sandbox.yml index ffc8a28478..e2edc878af 100644 --- a/.github/workflows/sandbox.yml +++ b/.github/workflows/sandbox.yml @@ -114,4 +114,4 @@ jobs: target: dind tags: ${{ steps.dind-names.outputs.tags }} build-args: "FLYTE_VERSION=${{ steps.set_version.outputs.flyte_version }}" - file: docker/sandbox-lite/Dockerfile + file: Dockerfile.sandbox-lite diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml new file mode 100644 index 0000000000..475e010496 --- /dev/null +++ b/.github/workflows/unit-tests.yml @@ -0,0 +1,41 @@ +name: Unit Tests + +on: + workflow_call: + inputs: + component: + required: true + type: string + go-version: + required: true + type: string + secrets: + FLYTE_BOT_PAT: + required: true +jobs: + tests: + name: Run Unit Test + defaults: + run: + working-directory: ${{ inputs.component }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: ${{ inputs.go-version }} + - name: Unit Tests + env: + GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }} + run: make install && make test_unit_codecov + # TODO(monorepo): Figure out how to do code coverage aggregation + - name: Push CodeCov + uses: codecov/codecov-action@v3.1.1 + env: + GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }} + with: + file: coverage.txt + flags: unittests + fail_ci_if_error: false diff --git a/Dockerfile b/Dockerfile index 3a6f9ae684..ea5cba63f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,15 @@ ENV GOARCH "${TARGETARCH}" ENV GOOS linux WORKDIR /flyteorg/build + +COPY datacatalog datacatalog +COPY flyteadmin flyteadmin +COPY flytecopilot flytecopilot +COPY flyteidl flyteidl +COPY flyteplugins flyteplugins +COPY flytepropeller flytepropeller +COPY flytestdlib flytestdlib + COPY go.mod go.sum ./ RUN go mod download COPY cmd cmd diff --git a/Dockerfile.datacatalog b/Dockerfile.datacatalog new file mode 100644 index 0000000000..dc36a2a698 --- /dev/null +++ b/Dockerfile.datacatalog @@ -0,0 +1,53 @@ +# WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES. +# ONLY EDIT THIS FILE FROM WITHIN THE 'FLYTEORG/BOILERPLATE' REPOSITORY: +# +# TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst + +FROM --platform=${BUILDPLATFORM} golang:1.19-alpine3.16 as builder + +ARG TARGETARCH +ENV GOARCH "${TARGETARCH}" +ENV GOOS linux + +RUN apk add git openssh-client make curl + +# Create the artifacts directory +RUN mkdir /artifacts + +# Pull GRPC health probe binary for liveness and readiness checks +RUN GRPC_HEALTH_PROBE_VERSION=v0.4.11 && \ + wget -qO/artifacts/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \ + chmod +x /artifacts/grpc_health_probe && \ + echo 'ded15e598d887ccc47bf2321371950bbf930f5e4856b9f75712ce4b2b5120480 /artifacts/grpc_health_probe' > .grpc_checksum && \ + sha256sum -c .grpc_checksum + +WORKDIR /go/src/github.com/flyteorg/datacatalog + +COPY datacatalog . +COPY flyteadmin ../flyteadmin +COPY flytecopilot ../flytecopilot +COPY flyteidl ../flyteidl +COPY flyteplugins ../flyteplugins +COPY flytepropeller ../flytepropeller +COPY flytestdlib ../flytestdlib + +# This 'linux_compile' target should compile binaries to the /artifacts directory +# The main entrypoint should be compiled to /artifacts/datacatalog +RUN make linux_compile + +# update the PATH to include the /artifacts directory +ENV PATH="/artifacts:${PATH}" + +# This will eventually move to centurylink/ca-certs:latest for minimum possible image size +FROM alpine:3.16 +LABEL org.opencontainers.image.source=https://github.com/flyteorg/datacatalog + +COPY --from=builder /artifacts /bin + +# Ensure the latest CA certs are present to authenticate SSL connections. +RUN apk --update add ca-certificates + +RUN addgroup -S flyte && adduser -S flyte -G flyte +USER flyte + +CMD ["datacatalog"] diff --git a/Dockerfile.flyteadmin b/Dockerfile.flyteadmin new file mode 100644 index 0000000000..2b10d66dcd --- /dev/null +++ b/Dockerfile.flyteadmin @@ -0,0 +1,53 @@ +# WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES. +# ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY: +# +# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst + +FROM --platform=${BUILDPLATFORM} golang:1.19-alpine3.16 as builder + +ARG TARGETARCH +ENV GOARCH "${TARGETARCH}" +ENV GOOS linux + +RUN apk add git openssh-client make curl + +# Create the artifacts directory +RUN mkdir /artifacts + +# Pull GRPC health probe binary for liveness and readiness checks +RUN GRPC_HEALTH_PROBE_VERSION=v0.4.11 && \ + wget -qO/artifacts/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \ + chmod +x /artifacts/grpc_health_probe && \ + echo 'ded15e598d887ccc47bf2321371950bbf930f5e4856b9f75712ce4b2b5120480 /artifacts/grpc_health_probe' > .grpc_checksum && \ + sha256sum -c .grpc_checksum + +WORKDIR /go/src/github.com/flyteorg/flyteadmin + +COPY datacatalog ../datacatalog +COPY flyteadmin . +COPY flytecopilot ../flytecopilot +COPY flyteidl ../flyteidl +COPY flyteplugins ../flyteplugins +COPY flytepropeller ../flytepropeller +COPY flytestdlib ../flytestdlib + +# This 'linux_compile' target should compile binaries to the /artifacts directory +# The main entrypoint should be compiled to /artifacts/flyteadmin +RUN make linux_compile + +# update the PATH to include the /artifacts directory +ENV PATH="/artifacts:${PATH}" + +# This will eventually move to centurylink/ca-certs:latest for minimum possible image size +FROM alpine:3.16 +LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteadmin + +COPY --from=builder /artifacts /bin + +# Ensure the latest CA certs are present to authenticate SSL connections. +RUN apk --update add ca-certificates + +RUN addgroup -S flyte && adduser -S flyte -G flyte +USER flyte + +CMD ["flyteadmin"] diff --git a/Dockerfile.flytecopilot b/Dockerfile.flytecopilot new file mode 100644 index 0000000000..8a31910175 --- /dev/null +++ b/Dockerfile.flytecopilot @@ -0,0 +1,39 @@ +# WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES. +# ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY: +# +# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst + +FROM --platform=${BUILDPLATFORM} golang:1.19-alpine3.16 as builder + +ARG TARGETARCH +ENV GOARCH "${TARGETARCH}" +ENV GOOS linux + +RUN apk add git openssh-client make curl + +WORKDIR /go/src/github.com/flyteorg/flytecopilot + +COPY datacatalog ../datacatalog +COPY flyteadmin ../flyteadmin +COPY flytecopilot . +COPY flyteidl ../flyteidl +COPY flyteplugins ../flyteplugins +COPY flytepropeller ../flytepropeller +COPY flytestdlib ../flytestdlib + +# This 'linux_compile' target should compile binaries to the /artifacts directory +# The main entrypoint should be compiled to /artifacts/flyteplugins +RUN make linux_compile + +# update the PATH to include the /artifacts directory +ENV PATH="/artifacts:${PATH}" + +# This will eventually move to centurylink/ca-certs:latest for minimum possible image size +FROM alpine:3.16 +LABEL org.opencontainers.image.source https://github.com/lyft/flyteplugins + +COPY --from=builder /artifacts /bin + +RUN apk --update add ca-certificates + +CMD ["flyte-copilot"] diff --git a/Dockerfile.flytepropeller b/Dockerfile.flytepropeller new file mode 100644 index 0000000000..33ba4aa7b9 --- /dev/null +++ b/Dockerfile.flytepropeller @@ -0,0 +1,42 @@ +# WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES. +# ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY: +# +# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst + +FROM --platform=${BUILDPLATFORM} golang:1.19-alpine3.16 as builder + +ARG TARGETARCH +ENV GOARCH "${TARGETARCH}" +ENV GOOS linux + +RUN apk add git openssh-client make curl + +WORKDIR /go/src/github.com/flyteorg/flytepropeller + +COPY datacatalog ../datacatalog +COPY flyteadmin ../flyteadmin +COPY flytecopilot ../flytecopilot +COPY flyteidl ../flyteidl +COPY flyteplugins ../flyteplugins +COPY flytepropeller . +COPY flytestdlib ../flytestdlib + +# This 'linux_compile' target should compile binaries to the /artifacts directory +# The main entrypoint should be compiled to /artifacts/flytepropeller +RUN make linux_compile + +# update the PATH to include the /artifacts directory +ENV PATH="/artifacts:${PATH}" + +# This will eventually move to centurylink/ca-certs:latest for minimum possible image size +FROM alpine:3.16 +LABEL org.opencontainers.image.source https://github.com/flyteorg/flytepropeller + +COPY --from=builder /artifacts /bin + +RUN apk --update add ca-certificates + +RUN addgroup -S flyte && adduser -S flyte -G flyte +USER flyte + +CMD ["flytepropeller"] diff --git a/Dockerfile.flytescheduler b/Dockerfile.flytescheduler new file mode 100644 index 0000000000..d701d37b14 --- /dev/null +++ b/Dockerfile.flytescheduler @@ -0,0 +1,47 @@ +# WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES. +# ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY: +# +# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst + +FROM --platform=${BUILDPLATFORM} golang:1.19-alpine3.16 as builder + +ARG TARGETARCH +ENV GOARCH "${TARGETARCH}" +ENV GOOS linux + +RUN apk add git openssh-client make curl + +# Create the artifacts directory +RUN mkdir /artifacts + +WORKDIR /go/src/github.com/flyteorg/flyteadmin + +COPY datacatalog ../datacatalog +COPY flyteadmin . +COPY flytecopilot ../flytecopilot +COPY flyteidl ../flyteidl +COPY flyteplugins ../flyteplugins +COPY flytepropeller ../flytepropeller +COPY flytestdlib ../flytestdlib + +# This 'linux_compile_scheduler' target should compile binaries to the /artifacts directory +# The main entrypoint should be compiled to /artifacts/flytescheduler +RUN make linux_compile_scheduler + +# update the PATH to include the /artifacts directory +ENV PATH="/artifacts:${PATH}" + +# This will eventually move to centurylink/ca-certs:latest for minimum possible image size +FROM alpine:3.15 +LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteadmin + +COPY --from=builder /artifacts /bin + +# Ensure the latest CA certs are present to authenticate SSL connections. +RUN apk --update add ca-certificates + +RUN addgroup -S flyte && adduser -S flyte -G flyte +USER flyte + +CMD ["flytescheduler"] + diff --git a/docker/sandbox-lite/Dockerfile b/Dockerfile.sandbox-lite similarity index 93% rename from docker/sandbox-lite/Dockerfile rename to Dockerfile.sandbox-lite index 06059c6783..095c83b6e1 100644 --- a/docker/sandbox-lite/Dockerfile +++ b/Dockerfile.sandbox-lite @@ -15,6 +15,15 @@ RUN apk add --no-cache build-base COPY go.mod go.sum /app/flyte/ WORKDIR /app/flyte + +COPY datacatalog datacatalog +COPY flyteadmin flyteadmin +COPY flytecopilot flytecopilot +COPY flyteidl flyteidl +COPY flyteplugins flyteplugins +COPY flytepropeller flytepropeller +COPY flytestdlib flytestdlib + RUN go mod download COPY --from=flyteconsole /app/ cmd/single/dist diff --git a/cmd/main.go b/cmd/main.go index da2fc15ad7..0fca35ab7d 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/flyteorg/flyte/cmd/single" - _ "github.com/flyteorg/flytepropeller/plugins" + _ "github.com/flyteorg/flyte/flytepropeller/plugins" "github.com/golang/glog" ) diff --git a/cmd/single/config.go b/cmd/single/config.go index a936770824..adbabe7ae5 100644 --- a/cmd/single/config.go +++ b/cmd/single/config.go @@ -1,6 +1,6 @@ package single -import "github.com/flyteorg/flytestdlib/config" +import "github.com/flyteorg/flyte/flytestdlib/config" //go:generate pflags Config --default-var=DefaultConfig @@ -21,9 +21,9 @@ type Propeller struct { } type Admin struct { - Disabled bool `json:"disabled" pflag:",Disables flyteadmin in the single binary mode"` - DisableScheduler bool `json:"disableScheduler" pflag:",Disables Native scheduler in the single binary mode"` - DisableClusterResourceManager bool `json:"disableClusterResourceManager" pflag:",Disables Cluster resource manager"` + Disabled bool `json:"disabled" pflag:",Disables flyteadmin in the single binary mode"` + DisableScheduler bool `json:"disableScheduler" pflag:",Disables Native scheduler in the single binary mode"` + DisableClusterResourceManager bool `json:"disableClusterResourceManager" pflag:",Disables Cluster resource manager"` SeedProjects []string `json:"seedProjects" pflag:",flyte projects to create by default."` } diff --git a/cmd/single/root.go b/cmd/single/root.go index ffc90b9066..1665b1841f 100644 --- a/cmd/single/root.go +++ b/cmd/single/root.go @@ -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" ) diff --git a/cmd/single/secret.go b/cmd/single/secret.go index 3135a9188e..b19cef4c4a 100644 --- a/cmd/single/secret.go +++ b/cmd/single/secret.go @@ -1,7 +1,7 @@ package single import ( - "github.com/flyteorg/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth" "github.com/spf13/cobra" ) diff --git a/cmd/single/start.go b/cmd/single/start.go index 6712e46892..5fc20b18d5 100644 --- a/cmd/single/start.go +++ b/cmd/single/start.go @@ -4,27 +4,27 @@ import ( "context" "net/http" - datacatalogConfig "github.com/flyteorg/datacatalog/pkg/config" - datacatalogRepo "github.com/flyteorg/datacatalog/pkg/repositories" - datacatalog "github.com/flyteorg/datacatalog/pkg/rpc/datacatalogservice" - "github.com/flyteorg/flyteadmin/pkg/clusterresource" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/plugins" - "github.com/flyteorg/flyteadmin/pkg/runtime" - adminServer "github.com/flyteorg/flyteadmin/pkg/server" - adminScheduler "github.com/flyteorg/flyteadmin/scheduler" - propellerEntrypoint "github.com/flyteorg/flytepropeller/pkg/controller" - propellerConfig "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/signals" - webhookEntrypoint "github.com/flyteorg/flytepropeller/pkg/webhook" - webhookConfig "github.com/flyteorg/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/profutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + datacatalogConfig "github.com/flyteorg/flyte/datacatalog/pkg/config" + datacatalogRepo "github.com/flyteorg/flyte/datacatalog/pkg/repositories" + datacatalog "github.com/flyteorg/flyte/datacatalog/pkg/rpc/datacatalogservice" + "github.com/flyteorg/flyte/flyteadmin/pkg/clusterresource" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + adminServer "github.com/flyteorg/flyte/flyteadmin/pkg/server" + "github.com/flyteorg/flyte/flyteadmin/plugins" + adminScheduler "github.com/flyteorg/flyte/flyteadmin/scheduler" + propellerEntrypoint "github.com/flyteorg/flyte/flytepropeller/pkg/controller" + propellerConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/signals" + webhookEntrypoint "github.com/flyteorg/flyte/flytepropeller/pkg/webhook" + webhookConfig "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/profutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" _ "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/cobra" @@ -70,7 +70,7 @@ func startAdmin(ctx context.Context, cfg Admin) error { if len(cfg.SeedProjects) != 0 { projects = cfg.SeedProjects } - logger.Infof(ctx, "Seeding default projects...",projects) + logger.Infof(ctx, "Seeding default projects...", projects) if err := adminServer.SeedProjects(ctx, projects); err != nil { return err } diff --git a/datacatalog/boilerplate/flyte/golang_support_tools/tools.go b/datacatalog/boilerplate/flyte/golang_support_tools/tools.go index 43de03450c..a78b61162a 100644 --- a/datacatalog/boilerplate/flyte/golang_support_tools/tools.go +++ b/datacatalog/boilerplate/flyte/golang_support_tools/tools.go @@ -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" ) diff --git a/datacatalog/cmd/entrypoints/migrate.go b/datacatalog/cmd/entrypoints/migrate.go index 392e9cdd06..1c8a7971a0 100644 --- a/datacatalog/cmd/entrypoints/migrate.go +++ b/datacatalog/cmd/entrypoints/migrate.go @@ -1,7 +1,7 @@ package entrypoints import ( - "github.com/flyteorg/datacatalog/pkg/repositories" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories" "context" diff --git a/datacatalog/cmd/entrypoints/root.go b/datacatalog/cmd/entrypoints/root.go index 9c898916c7..218249abb2 100644 --- a/datacatalog/cmd/entrypoints/root.go +++ b/datacatalog/cmd/entrypoints/root.go @@ -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" ) diff --git a/datacatalog/cmd/entrypoints/serve.go b/datacatalog/cmd/entrypoints/serve.go index 1300dbe980..c60a7e0bce 100644 --- a/datacatalog/cmd/entrypoints/serve.go +++ b/datacatalog/cmd/entrypoints/serve.go @@ -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" ) diff --git a/datacatalog/cmd/entrypoints/serve_dummy.go b/datacatalog/cmd/entrypoints/serve_dummy.go index 4192540d48..5296fd4686 100644 --- a/datacatalog/cmd/entrypoints/serve_dummy.go +++ b/datacatalog/cmd/entrypoints/serve_dummy.go @@ -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" ) diff --git a/datacatalog/cmd/main.go b/datacatalog/cmd/main.go index cf8de9bb48..b5db86d40b 100644 --- a/datacatalog/cmd/main.go +++ b/datacatalog/cmd/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/flyteorg/datacatalog/cmd/entrypoints" + "github.com/flyteorg/flyte/datacatalog/cmd/entrypoints" "github.com/golang/glog" ) diff --git a/datacatalog/go.mod b/datacatalog/go.mod index 420f2c3502..ca68a6501f 100644 --- a/datacatalog/go.mod +++ b/datacatalog/go.mod @@ -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 @@ -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 +) diff --git a/datacatalog/go.sum b/datacatalog/go.sum index fc32650ef7..debf474fcd 100644 --- a/datacatalog/go.sum +++ b/datacatalog/go.sum @@ -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= @@ -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= diff --git a/datacatalog/pkg/config/config.go b/datacatalog/pkg/config/config.go index 652fd3a60e..1dd8f73a51 100644 --- a/datacatalog/pkg/config/config.go +++ b/datacatalog/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "fmt" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) const SectionKey = "application" diff --git a/datacatalog/pkg/manager/impl/artifact_data_store.go b/datacatalog/pkg/manager/impl/artifact_data_store.go index e4c05ef55b..d65edfb6f2 100644 --- a/datacatalog/pkg/manager/impl/artifact_data_store.go +++ b/datacatalog/pkg/manager/impl/artifact_data_store.go @@ -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/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flytestdlib/storage" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/manager/impl/artifact_manager.go b/datacatalog/pkg/manager/impl/artifact_manager.go index b31686ae30..2c87e0438b 100644 --- a/datacatalog/pkg/manager/impl/artifact_manager.go +++ b/datacatalog/pkg/manager/impl/artifact_manager.go @@ -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" ) diff --git a/datacatalog/pkg/manager/impl/artifact_manager_test.go b/datacatalog/pkg/manager/impl/artifact_manager_test.go index e88ef09c81..f8b5f3d5d8 100644 --- a/datacatalog/pkg/manager/impl/artifact_manager_test.go +++ b/datacatalog/pkg/manager/impl/artifact_manager_test.go @@ -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/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/flyteorg/flytestdlib/contextutils" - mockScope "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" diff --git a/datacatalog/pkg/manager/impl/dataset_manager.go b/datacatalog/pkg/manager/impl/dataset_manager.go index 2607f5c387..50a3bd1465 100644 --- a/datacatalog/pkg/manager/impl/dataset_manager.go +++ b/datacatalog/pkg/manager/impl/dataset_manager.go @@ -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/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" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/manager/impl/dataset_manager_test.go b/datacatalog/pkg/manager/impl/dataset_manager_test.go index f9abf6641e..076eace195 100644 --- a/datacatalog/pkg/manager/impl/dataset_manager_test.go +++ b/datacatalog/pkg/manager/impl/dataset_manager_test.go @@ -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/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/flyteorg/flytestdlib/contextutils" - mockScope "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/datacatalog/pkg/manager/impl/reservation_manager.go b/datacatalog/pkg/manager/impl/reservation_manager.go index 3adee1141a..713a797b55 100644 --- a/datacatalog/pkg/manager/impl/reservation_manager.go +++ b/datacatalog/pkg/manager/impl/reservation_manager.go @@ -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" ) diff --git a/datacatalog/pkg/manager/impl/reservation_manager_test.go b/datacatalog/pkg/manager/impl/reservation_manager_test.go index 207ce81393..0c64bcc5ac 100644 --- a/datacatalog/pkg/manager/impl/reservation_manager_test.go +++ b/datacatalog/pkg/manager/impl/reservation_manager_test.go @@ -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" diff --git a/datacatalog/pkg/manager/impl/tag_manager.go b/datacatalog/pkg/manager/impl/tag_manager.go index 606f8e8768..f71bb2e9ec 100644 --- a/datacatalog/pkg/manager/impl/tag_manager.go +++ b/datacatalog/pkg/manager/impl/tag_manager.go @@ -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 { diff --git a/datacatalog/pkg/manager/impl/tag_manager_test.go b/datacatalog/pkg/manager/impl/tag_manager_test.go index 317d9e4c09..63d8c91280 100644 --- a/datacatalog/pkg/manager/impl/tag_manager_test.go +++ b/datacatalog/pkg/manager/impl/tag_manager_test.go @@ -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" diff --git a/datacatalog/pkg/manager/impl/validators/artifact_validator.go b/datacatalog/pkg/manager/impl/validators/artifact_validator.go index 1b3265a7d2..fddff14a3d 100644 --- a/datacatalog/pkg/manager/impl/validators/artifact_validator.go +++ b/datacatalog/pkg/manager/impl/validators/artifact_validator.go @@ -3,7 +3,7 @@ package validators import ( "fmt" - "github.com/flyteorg/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" ) diff --git a/datacatalog/pkg/manager/impl/validators/dataset_validator.go b/datacatalog/pkg/manager/impl/validators/dataset_validator.go index d950fc8f03..1521907836 100644 --- a/datacatalog/pkg/manager/impl/validators/dataset_validator.go +++ b/datacatalog/pkg/manager/impl/validators/dataset_validator.go @@ -1,7 +1,7 @@ package validators import ( - "github.com/flyteorg/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" ) diff --git a/datacatalog/pkg/manager/impl/validators/errors.go b/datacatalog/pkg/manager/impl/validators/errors.go index 923f26e8d2..ec8f94d90f 100644 --- a/datacatalog/pkg/manager/impl/validators/errors.go +++ b/datacatalog/pkg/manager/impl/validators/errors.go @@ -3,9 +3,9 @@ package validators import ( "fmt" - "github.com/flyteorg/datacatalog/pkg/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/errors" - "github.com/flyteorg/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/common" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/manager/impl/validators/pagination_validator.go b/datacatalog/pkg/manager/impl/validators/pagination_validator.go index bbe99d80a2..bf955676e3 100644 --- a/datacatalog/pkg/manager/impl/validators/pagination_validator.go +++ b/datacatalog/pkg/manager/impl/validators/pagination_validator.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/flyteorg/datacatalog/pkg/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/manager/impl/validators/partition_validator.go b/datacatalog/pkg/manager/impl/validators/partition_validator.go index d56d1a5d99..eeb1a95f7f 100644 --- a/datacatalog/pkg/manager/impl/validators/partition_validator.go +++ b/datacatalog/pkg/manager/impl/validators/partition_validator.go @@ -3,7 +3,7 @@ package validators import ( "fmt" - "github.com/flyteorg/datacatalog/pkg/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/repositories/config/postgres.go b/datacatalog/pkg/repositories/config/postgres.go index bcfb428aac..49c263f3fc 100644 --- a/datacatalog/pkg/repositories/config/postgres.go +++ b/datacatalog/pkg/repositories/config/postgres.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/database" - stdlibLogger "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/database" + stdlibLogger "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/datacatalog/pkg/repositories/config/postgres_test.go b/datacatalog/pkg/repositories/config/postgres_test.go index 659b7d723c..3d968e9090 100644 --- a/datacatalog/pkg/repositories/config/postgres_test.go +++ b/datacatalog/pkg/repositories/config/postgres_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/database" - mockScope "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/database" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" diff --git a/datacatalog/pkg/repositories/errors/errors.go b/datacatalog/pkg/repositories/errors/errors.go index 1c2a29fc2d..9dee09b23e 100644 --- a/datacatalog/pkg/repositories/errors/errors.go +++ b/datacatalog/pkg/repositories/errors/errors.go @@ -2,8 +2,8 @@ package errors import ( - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/errors" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/repositories/errors/postgres.go b/datacatalog/pkg/repositories/errors/postgres.go index 39cdddcc55..e30bd419f8 100644 --- a/datacatalog/pkg/repositories/errors/postgres.go +++ b/datacatalog/pkg/repositories/errors/postgres.go @@ -5,11 +5,11 @@ import ( "fmt" "reflect" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/jackc/pgconn" - catalogErrors "github.com/flyteorg/datacatalog/pkg/errors" + catalogErrors "github.com/flyteorg/flyte/datacatalog/pkg/errors" "google.golang.org/grpc/codes" "gorm.io/gorm" ) diff --git a/datacatalog/pkg/repositories/factory.go b/datacatalog/pkg/repositories/factory.go index 92b18ac387..c5d6e15711 100644 --- a/datacatalog/pkg/repositories/factory.go +++ b/datacatalog/pkg/repositories/factory.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/flytestdlib/database" - "github.com/flyteorg/datacatalog/pkg/repositories/config" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/config" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type RepoConfig int32 diff --git a/datacatalog/pkg/repositories/gormimpl/artifact.go b/datacatalog/pkg/repositories/gormimpl/artifact.go index b64f2f8180..ed0ddc17c9 100644 --- a/datacatalog/pkg/repositories/gormimpl/artifact.go +++ b/datacatalog/pkg/repositories/gormimpl/artifact.go @@ -5,11 +5,11 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/datacatalog/pkg/repositories/gormimpl/artifact_test.go b/datacatalog/pkg/repositories/gormimpl/artifact_test.go index ba14f081a1..ae3fb1554e 100644 --- a/datacatalog/pkg/repositories/gormimpl/artifact_test.go +++ b/datacatalog/pkg/repositories/gormimpl/artifact_test.go @@ -9,15 +9,15 @@ import ( "database/sql/driver" - "github.com/flyteorg/datacatalog/pkg/common" - apiErrors "github.com/flyteorg/datacatalog/pkg/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/datacatalog/pkg/repositories/utils" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + apiErrors "github.com/flyteorg/flyte/datacatalog/pkg/errors" + "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/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" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/repositories/gormimpl/dataset.go b/datacatalog/pkg/repositories/gormimpl/dataset.go index c7b4815863..416370ccf3 100644 --- a/datacatalog/pkg/repositories/gormimpl/dataset.go +++ b/datacatalog/pkg/repositories/gormimpl/dataset.go @@ -5,12 +5,12 @@ import ( idl_datacatalog "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/datacatalog/pkg/repositories/gormimpl/dataset_test.go b/datacatalog/pkg/repositories/gormimpl/dataset_test.go index b3836ea7e7..5b8bd36d8d 100644 --- a/datacatalog/pkg/repositories/gormimpl/dataset_test.go +++ b/datacatalog/pkg/repositories/gormimpl/dataset_test.go @@ -12,15 +12,15 @@ import ( "database/sql/driver" - "github.com/flyteorg/datacatalog/pkg/common" - datacatalog_error "github.com/flyteorg/datacatalog/pkg/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/datacatalog/pkg/repositories/utils" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + datacatalog_error "github.com/flyteorg/flyte/datacatalog/pkg/errors" + "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/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" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" ) func init() { diff --git a/datacatalog/pkg/repositories/gormimpl/filter.go b/datacatalog/pkg/repositories/gormimpl/filter.go index 05041c52bc..39cc1ad196 100644 --- a/datacatalog/pkg/repositories/gormimpl/filter.go +++ b/datacatalog/pkg/repositories/gormimpl/filter.go @@ -3,9 +3,9 @@ package gormimpl import ( "fmt" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) // String formats for various GORM expression queries diff --git a/datacatalog/pkg/repositories/gormimpl/filter_test.go b/datacatalog/pkg/repositories/gormimpl/filter_test.go index 96d2a6af41..c267e86fef 100644 --- a/datacatalog/pkg/repositories/gormimpl/filter_test.go +++ b/datacatalog/pkg/repositories/gormimpl/filter_test.go @@ -3,7 +3,7 @@ package gormimpl import ( "testing" - "github.com/flyteorg/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/common" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/gormimpl/join.go b/datacatalog/pkg/repositories/gormimpl/join.go index 0c779f554a..6c37135754 100644 --- a/datacatalog/pkg/repositories/gormimpl/join.go +++ b/datacatalog/pkg/repositories/gormimpl/join.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) const ( diff --git a/datacatalog/pkg/repositories/gormimpl/join_test.go b/datacatalog/pkg/repositories/gormimpl/join_test.go index 62fb627792..df9843e448 100644 --- a/datacatalog/pkg/repositories/gormimpl/join_test.go +++ b/datacatalog/pkg/repositories/gormimpl/join_test.go @@ -3,7 +3,7 @@ package gormimpl import ( "testing" - "github.com/flyteorg/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/common" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/gormimpl/list.go b/datacatalog/pkg/repositories/gormimpl/list.go index a231c8a161..260039cc8a 100644 --- a/datacatalog/pkg/repositories/gormimpl/list.go +++ b/datacatalog/pkg/repositories/gormimpl/list.go @@ -3,11 +3,11 @@ package gormimpl import ( "fmt" - errors2 "github.com/flyteorg/datacatalog/pkg/errors" + errors2 "github.com/flyteorg/flyte/datacatalog/pkg/errors" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "google.golang.org/grpc/codes" "gorm.io/gorm" ) diff --git a/datacatalog/pkg/repositories/gormimpl/list_test.go b/datacatalog/pkg/repositories/gormimpl/list_test.go index 2220636f29..4d5a9ce685 100644 --- a/datacatalog/pkg/repositories/gormimpl/list_test.go +++ b/datacatalog/pkg/repositories/gormimpl/list_test.go @@ -6,9 +6,9 @@ import ( "testing" mocket "github.com/Selvatico/go-mocket" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/datacatalog/pkg/repositories/utils" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "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/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/gormimpl/metrics.go b/datacatalog/pkg/repositories/gormimpl/metrics.go index 42fccd3ecf..5a7ff74c2a 100644 --- a/datacatalog/pkg/repositories/gormimpl/metrics.go +++ b/datacatalog/pkg/repositories/gormimpl/metrics.go @@ -3,8 +3,8 @@ package gormimpl import ( "time" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) // Common metrics for DB CRUD operations diff --git a/datacatalog/pkg/repositories/gormimpl/reservation.go b/datacatalog/pkg/repositories/gormimpl/reservation.go index fffeba36ac..9d005b5552 100644 --- a/datacatalog/pkg/repositories/gormimpl/reservation.go +++ b/datacatalog/pkg/repositories/gormimpl/reservation.go @@ -3,17 +3,17 @@ package gormimpl import ( "context" - datacatalog_error "github.com/flyteorg/datacatalog/pkg/errors" + datacatalog_error "github.com/flyteorg/flyte/datacatalog/pkg/errors" "google.golang.org/grpc/codes" "time" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - errors2 "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + errors2 "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/datacatalog/pkg/repositories/gormimpl/reservation_test.go b/datacatalog/pkg/repositories/gormimpl/reservation_test.go index 12ca23fd55..2a357a09f7 100644 --- a/datacatalog/pkg/repositories/gormimpl/reservation_test.go +++ b/datacatalog/pkg/repositories/gormimpl/reservation_test.go @@ -9,15 +9,15 @@ import ( "gorm.io/driver/postgres" "gorm.io/gorm" - "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" - apiErrors "github.com/flyteorg/datacatalog/pkg/errors" + apiErrors "github.com/flyteorg/flyte/datacatalog/pkg/errors" "google.golang.org/grpc/codes" mocket "github.com/Selvatico/go-mocket" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/gormimpl/sort.go b/datacatalog/pkg/repositories/gormimpl/sort.go index 43b0a660e7..04b98adc90 100644 --- a/datacatalog/pkg/repositories/gormimpl/sort.go +++ b/datacatalog/pkg/repositories/gormimpl/sort.go @@ -3,7 +3,7 @@ package gormimpl import ( "fmt" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" ) diff --git a/datacatalog/pkg/repositories/gormimpl/tag.go b/datacatalog/pkg/repositories/gormimpl/tag.go index 24c7750ed9..e3992e8473 100644 --- a/datacatalog/pkg/repositories/gormimpl/tag.go +++ b/datacatalog/pkg/repositories/gormimpl/tag.go @@ -5,10 +5,10 @@ import ( idl_datacatalog "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/datacatalog/pkg/repositories/gormimpl/tag_test.go b/datacatalog/pkg/repositories/gormimpl/tag_test.go index 9dbb4270a5..b8e73d5f4a 100644 --- a/datacatalog/pkg/repositories/gormimpl/tag_test.go +++ b/datacatalog/pkg/repositories/gormimpl/tag_test.go @@ -14,14 +14,14 @@ import ( "database/sql/driver" - datacatalog_error "github.com/flyteorg/datacatalog/pkg/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/datacatalog/pkg/repositories/utils" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + datacatalog_error "github.com/flyteorg/flyte/datacatalog/pkg/errors" + "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/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/repositories/handle.go b/datacatalog/pkg/repositories/handle.go index ff404ba32c..540ba3c7a9 100644 --- a/datacatalog/pkg/repositories/handle.go +++ b/datacatalog/pkg/repositories/handle.go @@ -7,12 +7,12 @@ import ( "fmt" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/flytestdlib/database" - "github.com/flyteorg/datacatalog/pkg/repositories/config" - "github.com/flyteorg/datacatalog/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/config" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/datacatalog/pkg/repositories/handle_test.go b/datacatalog/pkg/repositories/handle_test.go index a412e6783c..cda0822ac6 100644 --- a/datacatalog/pkg/repositories/handle_test.go +++ b/datacatalog/pkg/repositories/handle_test.go @@ -6,13 +6,13 @@ import ( "testing" mocket "github.com/Selvatico/go-mocket" - "github.com/flyteorg/datacatalog/pkg/repositories/config" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/config" + "github.com/flyteorg/flyte/flytestdlib/database" "github.com/stretchr/testify/assert" "database/sql/driver" - "github.com/flyteorg/datacatalog/pkg/repositories/utils" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/utils" ) func TestCreateDB(t *testing.T) { diff --git a/datacatalog/pkg/repositories/initialize.go b/datacatalog/pkg/repositories/initialize.go index ff6b5a79e4..b5bde058db 100644 --- a/datacatalog/pkg/repositories/initialize.go +++ b/datacatalog/pkg/repositories/initialize.go @@ -5,10 +5,10 @@ import ( "errors" "reflect" - errors2 "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/runtime" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + errors2 "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/runtime" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/jackc/pgconn" ) diff --git a/datacatalog/pkg/repositories/interfaces/artifact_repo.go b/datacatalog/pkg/repositories/interfaces/artifact_repo.go index 9607cb62d3..ae56b99d7f 100644 --- a/datacatalog/pkg/repositories/interfaces/artifact_repo.go +++ b/datacatalog/pkg/repositories/interfaces/artifact_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) //go:generate mockery -name=ArtifactRepo -output=../mocks -case=underscore diff --git a/datacatalog/pkg/repositories/interfaces/dataset_repo.go b/datacatalog/pkg/repositories/interfaces/dataset_repo.go index 94bdb00877..984adadfbe 100644 --- a/datacatalog/pkg/repositories/interfaces/dataset_repo.go +++ b/datacatalog/pkg/repositories/interfaces/dataset_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) //go:generate mockery -name=DatasetRepo -output=../mocks -case=underscore diff --git a/datacatalog/pkg/repositories/interfaces/partition_repo.go b/datacatalog/pkg/repositories/interfaces/partition_repo.go index 5874a5a285..1b4d538b13 100644 --- a/datacatalog/pkg/repositories/interfaces/partition_repo.go +++ b/datacatalog/pkg/repositories/interfaces/partition_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) //go:generate mockery -name=PartitionRepo -output=../mocks -case=underscore diff --git a/datacatalog/pkg/repositories/interfaces/reservation_repo.go b/datacatalog/pkg/repositories/interfaces/reservation_repo.go index 40b0cfd8df..7bfbf9cf24 100644 --- a/datacatalog/pkg/repositories/interfaces/reservation_repo.go +++ b/datacatalog/pkg/repositories/interfaces/reservation_repo.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) //go:generate mockery -name=ReservationRepo -output=../mocks -case=underscore diff --git a/datacatalog/pkg/repositories/interfaces/tag_repo.go b/datacatalog/pkg/repositories/interfaces/tag_repo.go index eb3d51ac94..d3a4c570f8 100644 --- a/datacatalog/pkg/repositories/interfaces/tag_repo.go +++ b/datacatalog/pkg/repositories/interfaces/tag_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) //go:generate mockery -name=TagRepo -output=../mocks -case=underscore diff --git a/datacatalog/pkg/repositories/mocks/artifact_repo.go b/datacatalog/pkg/repositories/mocks/artifact_repo.go index f1677ea7bc..bf939f3e4b 100644 --- a/datacatalog/pkg/repositories/mocks/artifact_repo.go +++ b/datacatalog/pkg/repositories/mocks/artifact_repo.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/datacatalog/pkg/repositories/models" + models "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) // ArtifactRepo is an autogenerated mock type for the ArtifactRepo type diff --git a/datacatalog/pkg/repositories/mocks/base.go b/datacatalog/pkg/repositories/mocks/base.go index 993fe79ed6..8c9f8cb769 100644 --- a/datacatalog/pkg/repositories/mocks/base.go +++ b/datacatalog/pkg/repositories/mocks/base.go @@ -1,6 +1,6 @@ package mocks -import "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" +import "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" type DataCatalogRepo struct { MockDatasetRepo *DatasetRepo diff --git a/datacatalog/pkg/repositories/mocks/dataset_repo.go b/datacatalog/pkg/repositories/mocks/dataset_repo.go index 57ac32b304..d0a2079f26 100644 --- a/datacatalog/pkg/repositories/mocks/dataset_repo.go +++ b/datacatalog/pkg/repositories/mocks/dataset_repo.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/datacatalog/pkg/repositories/models" + models "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) // DatasetRepo is an autogenerated mock type for the DatasetRepo type diff --git a/datacatalog/pkg/repositories/mocks/partition_repo.go b/datacatalog/pkg/repositories/mocks/partition_repo.go index e7beb1c167..b3562c1d75 100644 --- a/datacatalog/pkg/repositories/mocks/partition_repo.go +++ b/datacatalog/pkg/repositories/mocks/partition_repo.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/datacatalog/pkg/repositories/models" + models "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) // PartitionRepo is an autogenerated mock type for the PartitionRepo type diff --git a/datacatalog/pkg/repositories/mocks/reservation_repo.go b/datacatalog/pkg/repositories/mocks/reservation_repo.go index 5214107ef5..16c93b19c3 100644 --- a/datacatalog/pkg/repositories/mocks/reservation_repo.go +++ b/datacatalog/pkg/repositories/mocks/reservation_repo.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/datacatalog/pkg/repositories/models" + models "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" time "time" ) diff --git a/datacatalog/pkg/repositories/mocks/tag_repo.go b/datacatalog/pkg/repositories/mocks/tag_repo.go index 3070cd58fc..d64de0f691 100644 --- a/datacatalog/pkg/repositories/mocks/tag_repo.go +++ b/datacatalog/pkg/repositories/mocks/tag_repo.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/datacatalog/pkg/repositories/models" + models "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" ) // TagRepo is an autogenerated mock type for the TagRepo type diff --git a/datacatalog/pkg/repositories/models/list.go b/datacatalog/pkg/repositories/models/list.go index 234c981a77..09a74ac4da 100644 --- a/datacatalog/pkg/repositories/models/list.go +++ b/datacatalog/pkg/repositories/models/list.go @@ -1,6 +1,6 @@ package models -import "github.com/flyteorg/datacatalog/pkg/common" +import "github.com/flyteorg/flyte/datacatalog/pkg/common" // Inputs to specify to list models type ListModelsInput struct { diff --git a/datacatalog/pkg/repositories/postgres_repo.go b/datacatalog/pkg/repositories/postgres_repo.go index c51d5db6fd..a2a0330aea 100644 --- a/datacatalog/pkg/repositories/postgres_repo.go +++ b/datacatalog/pkg/repositories/postgres_repo.go @@ -1,10 +1,10 @@ package repositories import ( - "github.com/flyteorg/datacatalog/pkg/repositories/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/gormimpl" - "github.com/flyteorg/datacatalog/pkg/repositories/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/gormimpl" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/datacatalog/pkg/repositories/transformers/artifact.go b/datacatalog/pkg/repositories/transformers/artifact.go index ca707dfbf6..c02f75502f 100644 --- a/datacatalog/pkg/repositories/transformers/artifact.go +++ b/datacatalog/pkg/repositories/transformers/artifact.go @@ -1,8 +1,8 @@ package transformers import ( - "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/datacatalog" "github.com/golang/protobuf/ptypes" "google.golang.org/grpc/codes" diff --git a/datacatalog/pkg/repositories/transformers/artifact_test.go b/datacatalog/pkg/repositories/transformers/artifact_test.go index f73dc4f900..d1d4143559 100644 --- a/datacatalog/pkg/repositories/transformers/artifact_test.go +++ b/datacatalog/pkg/repositories/transformers/artifact_test.go @@ -5,7 +5,7 @@ import ( "time" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "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/golang/protobuf/ptypes" diff --git a/datacatalog/pkg/repositories/transformers/dataset.go b/datacatalog/pkg/repositories/transformers/dataset.go index f0d6eebfbe..1e38461b21 100644 --- a/datacatalog/pkg/repositories/transformers/dataset.go +++ b/datacatalog/pkg/repositories/transformers/dataset.go @@ -1,7 +1,7 @@ package transformers import ( - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" ) diff --git a/datacatalog/pkg/repositories/transformers/dataset_test.go b/datacatalog/pkg/repositories/transformers/dataset_test.go index 8882013577..e735c9fe5a 100644 --- a/datacatalog/pkg/repositories/transformers/dataset_test.go +++ b/datacatalog/pkg/repositories/transformers/dataset_test.go @@ -3,7 +3,7 @@ package transformers import ( "testing" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/transformers/filters.go b/datacatalog/pkg/repositories/transformers/filters.go index 17889ca875..2bd1780fe4 100644 --- a/datacatalog/pkg/repositories/transformers/filters.go +++ b/datacatalog/pkg/repositories/transformers/filters.go @@ -3,13 +3,13 @@ package transformers import ( "context" - "github.com/flyteorg/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/manager/impl/validators" - "github.com/flyteorg/datacatalog/pkg/repositories/gormimpl" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "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/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flytestdlib/logger" ) const ( diff --git a/datacatalog/pkg/repositories/transformers/filters_test.go b/datacatalog/pkg/repositories/transformers/filters_test.go index 3e4f08f252..3e56e45028 100644 --- a/datacatalog/pkg/repositories/transformers/filters_test.go +++ b/datacatalog/pkg/repositories/transformers/filters_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/transformers/pagination.go b/datacatalog/pkg/repositories/transformers/pagination.go index 0965e12302..63ef90f8bd 100644 --- a/datacatalog/pkg/repositories/transformers/pagination.go +++ b/datacatalog/pkg/repositories/transformers/pagination.go @@ -4,10 +4,10 @@ import ( "strconv" "strings" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/errors" - "github.com/flyteorg/datacatalog/pkg/repositories/gormimpl" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/errors" + "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" "google.golang.org/grpc/codes" ) diff --git a/datacatalog/pkg/repositories/transformers/pagination_test.go b/datacatalog/pkg/repositories/transformers/pagination_test.go index 7cfa3d2fec..97ed7c55c2 100644 --- a/datacatalog/pkg/repositories/transformers/pagination_test.go +++ b/datacatalog/pkg/repositories/transformers/pagination_test.go @@ -3,8 +3,8 @@ package transformers import ( "testing" - "github.com/flyteorg/datacatalog/pkg/common" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/common" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/transformers/partition.go b/datacatalog/pkg/repositories/transformers/partition.go index e19bae0776..865f7b50c9 100644 --- a/datacatalog/pkg/repositories/transformers/partition.go +++ b/datacatalog/pkg/repositories/transformers/partition.go @@ -1,6 +1,6 @@ package transformers -import "github.com/flyteorg/datacatalog/pkg/repositories/models" +import "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" func FromPartitionKeyModel(partitionKeys []models.PartitionKey) []string { partitionKeyStrings := make([]string, len(partitionKeys)) diff --git a/datacatalog/pkg/repositories/transformers/reservation.go b/datacatalog/pkg/repositories/transformers/reservation.go index 50e9133be8..19cb9d9a8b 100644 --- a/datacatalog/pkg/repositories/transformers/reservation.go +++ b/datacatalog/pkg/repositories/transformers/reservation.go @@ -3,8 +3,8 @@ package transformers import ( "time" - "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/datacatalog" "github.com/golang/protobuf/ptypes" diff --git a/datacatalog/pkg/repositories/transformers/reservation_test.go b/datacatalog/pkg/repositories/transformers/reservation_test.go index 190c153bab..d03751f878 100644 --- a/datacatalog/pkg/repositories/transformers/reservation_test.go +++ b/datacatalog/pkg/repositories/transformers/reservation_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/transformers/tag.go b/datacatalog/pkg/repositories/transformers/tag.go index 28b7f4a890..4927c01dff 100644 --- a/datacatalog/pkg/repositories/transformers/tag.go +++ b/datacatalog/pkg/repositories/transformers/tag.go @@ -1,7 +1,7 @@ package transformers import ( - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" ) diff --git a/datacatalog/pkg/repositories/transformers/tag_test.go b/datacatalog/pkg/repositories/transformers/tag_test.go index f02bc472f6..08eb9f1a01 100644 --- a/datacatalog/pkg/repositories/transformers/tag_test.go +++ b/datacatalog/pkg/repositories/transformers/tag_test.go @@ -3,7 +3,7 @@ package transformers import ( "testing" - "github.com/flyteorg/datacatalog/pkg/repositories/models" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "github.com/stretchr/testify/assert" ) diff --git a/datacatalog/pkg/repositories/transformers/util.go b/datacatalog/pkg/repositories/transformers/util.go index fd356ee680..03ffe9323c 100644 --- a/datacatalog/pkg/repositories/transformers/util.go +++ b/datacatalog/pkg/repositories/transformers/util.go @@ -1,7 +1,7 @@ package transformers import ( - "github.com/flyteorg/datacatalog/pkg/errors" + "github.com/flyteorg/flyte/datacatalog/pkg/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" diff --git a/datacatalog/pkg/rpc/datacatalogservice/service.go b/datacatalog/pkg/rpc/datacatalogservice/service.go index 7f4d5e2025..806997cfe8 100644 --- a/datacatalog/pkg/rpc/datacatalogservice/service.go +++ b/datacatalog/pkg/rpc/datacatalogservice/service.go @@ -13,16 +13,16 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/reflection" - "github.com/flyteorg/datacatalog/pkg/config" - "github.com/flyteorg/datacatalog/pkg/manager/impl" - "github.com/flyteorg/datacatalog/pkg/manager/interfaces" - "github.com/flyteorg/datacatalog/pkg/repositories" - "github.com/flyteorg/datacatalog/pkg/runtime" + "github.com/flyteorg/flyte/datacatalog/pkg/config" + "github.com/flyteorg/flyte/datacatalog/pkg/manager/impl" + "github.com/flyteorg/flyte/datacatalog/pkg/manager/interfaces" + "github.com/flyteorg/flyte/datacatalog/pkg/repositories" + "github.com/flyteorg/flyte/datacatalog/pkg/runtime" + "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" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" ) type DataCatalogService struct { diff --git a/datacatalog/pkg/runtime/application_config_provider.go b/datacatalog/pkg/runtime/application_config_provider.go index b4f7399d37..7d0938912f 100644 --- a/datacatalog/pkg/runtime/application_config_provider.go +++ b/datacatalog/pkg/runtime/application_config_provider.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/datacatalog/pkg/runtime/configs" - "github.com/flyteorg/flytestdlib/database" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/datacatalog/pkg/runtime/configs" + "github.com/flyteorg/flyte/flytestdlib/database" + "github.com/flyteorg/flyte/flytestdlib/logger" ) const datacatalog = "datacatalog" diff --git a/datacatalog/pkg/runtime/configs/data_catalog_config.go b/datacatalog/pkg/runtime/configs/data_catalog_config.go index c4d08244fb..72b734b77b 100644 --- a/datacatalog/pkg/runtime/configs/data_catalog_config.go +++ b/datacatalog/pkg/runtime/configs/data_catalog_config.go @@ -3,7 +3,7 @@ package configs import ( "time" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags DataCatalogConfig --default-var=defaultConfig diff --git a/flyteadmin/Makefile b/flyteadmin/Makefile index df3dcd3797..8d00995378 100644 --- a/flyteadmin/Makefile +++ b/flyteadmin/Makefile @@ -7,6 +7,7 @@ include boilerplate/flyte/end2end/Makefile GIT_VERSION := $(shell git describe --always --tags) GIT_HASH := $(shell git rev-parse --short HEAD) TIMESTAMP := $(shell date '+%Y-%m-%d') +# TODO(monorepo): Do we need to change this? This is used in the service that provides a version. PACKAGE ?=github.com/flyteorg/flytestdlib LD_FLAGS="-s -w -X $(PACKAGE)/version.Version=$(GIT_VERSION) -X $(PACKAGE)/version.Build=$(GIT_HASH) -X $(PACKAGE)/version.BuildTime=$(TIMESTAMP)" diff --git a/flyteadmin/auth/auth_context.go b/flyteadmin/auth/auth_context.go index cde008d105..54eacc399d 100644 --- a/flyteadmin/auth/auth_context.go +++ b/flyteadmin/auth/auth_context.go @@ -10,14 +10,14 @@ import ( "strings" "time" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "github.com/coreos/go-oidc" - "github.com/flyteorg/flyteadmin/auth/config" - "github.com/flyteorg/flyteadmin/auth/interfaces" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "golang.org/x/oauth2" ) diff --git a/flyteadmin/auth/authzserver/authorize.go b/flyteadmin/auth/authzserver/authorize.go index c735e197d4..d0e8ecbdb0 100644 --- a/flyteadmin/auth/authzserver/authorize.go +++ b/flyteadmin/auth/authzserver/authorize.go @@ -6,11 +6,11 @@ import ( "net/http" "time" - "github.com/flyteorg/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth" "github.com/ory/fosite" - "github.com/flyteorg/flyteadmin/auth/interfaces" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/flyteadmin/auth/authzserver/authorize_test.go b/flyteadmin/auth/authzserver/authorize_test.go index 99a01d58aa..08c5df2898 100644 --- a/flyteadmin/auth/authzserver/authorize_test.go +++ b/flyteadmin/auth/authzserver/authorize_test.go @@ -8,14 +8,14 @@ import ( "net/http/httptest" "testing" - config2 "github.com/flyteorg/flytestdlib/config" + config2 "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteadmin/auth/interfaces/mocks" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/ory/fosite" diff --git a/flyteadmin/auth/authzserver/claims_verifier.go b/flyteadmin/auth/authzserver/claims_verifier.go index 64284a6378..941bc59aa4 100644 --- a/flyteadmin/auth/authzserver/claims_verifier.go +++ b/flyteadmin/auth/authzserver/claims_verifier.go @@ -7,8 +7,8 @@ import ( "github.com/ory/x/jwtx" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteadmin/auth" - "github.com/flyteorg/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" ) diff --git a/flyteadmin/auth/authzserver/initialize.go b/flyteadmin/auth/authzserver/initialize.go index afd428e86a..74417403ee 100644 --- a/flyteadmin/auth/authzserver/initialize.go +++ b/flyteadmin/auth/authzserver/initialize.go @@ -7,7 +7,7 @@ import ( "github.com/ory/fosite" - "github.com/flyteorg/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" "github.com/ory/fosite/compose" "github.com/ory/fosite/token/jwt" diff --git a/flyteadmin/auth/authzserver/initialize_test.go b/flyteadmin/auth/authzserver/initialize_test.go index 6394fd3fdc..e9dae7ba28 100644 --- a/flyteadmin/auth/authzserver/initialize_test.go +++ b/flyteadmin/auth/authzserver/initialize_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteadmin/auth" - "github.com/flyteorg/flyteadmin/auth/interfaces/mocks" + "github.com/flyteorg/flyte/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks" ) func TestRegisterHandlers(t *testing.T) { diff --git a/flyteadmin/auth/authzserver/metadata.go b/flyteadmin/auth/authzserver/metadata.go index 6e1155428d..043de89d87 100644 --- a/flyteadmin/auth/authzserver/metadata.go +++ b/flyteadmin/auth/authzserver/metadata.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "github.com/flyteorg/flyteadmin/auth" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/lestrrat-go/jwx/jwk" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" ) var ( diff --git a/flyteadmin/auth/authzserver/metadata_provider.go b/flyteadmin/auth/authzserver/metadata_provider.go index ee9ce4d029..7c5c66e2a3 100644 --- a/flyteadmin/auth/authzserver/metadata_provider.go +++ b/flyteadmin/auth/authzserver/metadata_provider.go @@ -7,9 +7,9 @@ import ( "net/url" "strings" - "github.com/flyteorg/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth" - authConfig "github.com/flyteorg/flyteadmin/auth/config" + authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" ) diff --git a/flyteadmin/auth/authzserver/metadata_provider_test.go b/flyteadmin/auth/authzserver/metadata_provider_test.go index b3606ac4a1..f1ad541976 100644 --- a/flyteadmin/auth/authzserver/metadata_provider_test.go +++ b/flyteadmin/auth/authzserver/metadata_provider_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - config2 "github.com/flyteorg/flytestdlib/config" + config2 "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flyteadmin/auth/config" - authConfig "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" + authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/auth/authzserver/metadata_test.go b/flyteadmin/auth/authzserver/metadata_test.go index 3d041dde3e..8b32559a9f 100644 --- a/flyteadmin/auth/authzserver/metadata_test.go +++ b/flyteadmin/auth/authzserver/metadata_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/flyteorg/flyteadmin/auth/interfaces/mocks" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks" "github.com/lestrrat-go/jwx/jwk" - "github.com/flyteorg/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/auth/authzserver/provider.go b/flyteadmin/auth/authzserver/provider.go index f20ebcbe06..e9eaf1f999 100644 --- a/flyteadmin/auth/authzserver/provider.go +++ b/flyteadmin/auth/authzserver/provider.go @@ -9,23 +9,23 @@ import ( "fmt" "time" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/logger" "k8s.io/apimachinery/pkg/util/sets" "github.com/lestrrat-go/jwx/jwk" - "github.com/flyteorg/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" - "github.com/flyteorg/flyteadmin/auth" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" jwtgo "github.com/golang-jwt/jwt/v4" fositeOAuth2 "github.com/ory/fosite/handler/oauth2" "github.com/ory/fosite/token/jwt" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/ory/fosite" "github.com/ory/fosite/compose" diff --git a/flyteadmin/auth/authzserver/provider_test.go b/flyteadmin/auth/authzserver/provider_test.go index 98806b98a2..f26a959ce1 100644 --- a/flyteadmin/auth/authzserver/provider_test.go +++ b/flyteadmin/auth/authzserver/provider_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/auth" - "github.com/flyteorg/flyteadmin/auth/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" ) func newMockProvider(t testing.TB) (Provider, auth.SecretsSet) { diff --git a/flyteadmin/auth/authzserver/resource_server.go b/flyteadmin/auth/authzserver/resource_server.go index e3b36b05c8..efe838fc1a 100644 --- a/flyteadmin/auth/authzserver/resource_server.go +++ b/flyteadmin/auth/authzserver/resource_server.go @@ -14,11 +14,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/coreos/go-oidc" - authConfig "github.com/flyteorg/flyteadmin/auth/config" - "github.com/flyteorg/flyteadmin/auth/interfaces" + authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" "golang.org/x/oauth2" ) diff --git a/flyteadmin/auth/authzserver/resource_server_test.go b/flyteadmin/auth/authzserver/resource_server_test.go index 3338defebc..b3adfab931 100644 --- a/flyteadmin/auth/authzserver/resource_server_test.go +++ b/flyteadmin/auth/authzserver/resource_server_test.go @@ -21,9 +21,9 @@ import ( "github.com/lestrrat-go/jwx/jwk" "github.com/coreos/go-oidc" - "github.com/flyteorg/flyteadmin/auth/config" - authConfig "github.com/flyteorg/flyteadmin/auth/config" - stdlibConfig "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" + authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config" + stdlibConfig "github.com/flyteorg/flyte/flytestdlib/config" ) func newMockResourceServer(t testing.TB, publicKey rsa.PublicKey) (resourceServer ResourceServer, closer func()) { diff --git a/flyteadmin/auth/authzserver/stateless_token_store.go b/flyteadmin/auth/authzserver/stateless_token_store.go index 93cb85065e..9b53618a80 100644 --- a/flyteadmin/auth/authzserver/stateless_token_store.go +++ b/flyteadmin/auth/authzserver/stateless_token_store.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/flyteorg/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "k8s.io/apimachinery/pkg/util/sets" "github.com/ory/fosite/handler/oauth2" diff --git a/flyteadmin/auth/authzserver/token.go b/flyteadmin/auth/authzserver/token.go index f4bc1f9a3f..9a12891ac5 100644 --- a/flyteadmin/auth/authzserver/token.go +++ b/flyteadmin/auth/authzserver/token.go @@ -7,9 +7,9 @@ import ( "github.com/ory/fosite" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" ) var ( diff --git a/flyteadmin/auth/authzserver/token_test.go b/flyteadmin/auth/authzserver/token_test.go index 78e538402d..f8f5185c82 100644 --- a/flyteadmin/auth/authzserver/token_test.go +++ b/flyteadmin/auth/authzserver/token_test.go @@ -15,11 +15,11 @@ import ( jwtgo "github.com/golang-jwt/jwt/v4" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/auth/interfaces/mocks" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks" ) func Test_tokenEndpoint(t *testing.T) { diff --git a/flyteadmin/auth/authzserver/utils.go b/flyteadmin/auth/authzserver/utils.go index 306f9ae033..03ebbb38fd 100644 --- a/flyteadmin/auth/authzserver/utils.go +++ b/flyteadmin/auth/authzserver/utils.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "net/http" - "github.com/flyteorg/flyteadmin/auth" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/gtank/cryptopasta" "github.com/ory/fosite" ) diff --git a/flyteadmin/auth/config/config.go b/flyteadmin/auth/config/config.go index db6665346b..217983683e 100644 --- a/flyteadmin/auth/config/config.go +++ b/flyteadmin/auth/config/config.go @@ -6,7 +6,7 @@ import ( "github.com/ory/fosite" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var=DefaultConfig diff --git a/flyteadmin/auth/config/config_test.go b/flyteadmin/auth/config/config_test.go index b971371e7b..381d28d1bc 100644 --- a/flyteadmin/auth/config/config_test.go +++ b/flyteadmin/auth/config/config_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "testing" - "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/ghodss/yaml" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/auth/constants.go b/flyteadmin/auth/constants.go index 7b64227561..1146a06ed9 100644 --- a/flyteadmin/auth/constants.go +++ b/flyteadmin/auth/constants.go @@ -1,6 +1,6 @@ package auth -import "github.com/flyteorg/flytestdlib/contextutils" +import "github.com/flyteorg/flyte/flytestdlib/contextutils" const ( // OAuth2 Parameters diff --git a/flyteadmin/auth/cookie.go b/flyteadmin/auth/cookie.go index f936794705..6dd9edf139 100644 --- a/flyteadmin/auth/cookie.go +++ b/flyteadmin/auth/cookie.go @@ -9,11 +9,11 @@ import ( "net/url" "time" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/gorilla/securecookie" - "github.com/flyteorg/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" ) const ( diff --git a/flyteadmin/auth/cookie_manager.go b/flyteadmin/auth/cookie_manager.go index 8b6eca36bd..22388b88a5 100644 --- a/flyteadmin/auth/cookie_manager.go +++ b/flyteadmin/auth/cookie_manager.go @@ -8,12 +8,12 @@ import ( "net/http" "time" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" "golang.org/x/oauth2" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" ) type CookieManager struct { diff --git a/flyteadmin/auth/cookie_manager_test.go b/flyteadmin/auth/cookie_manager_test.go index 5bb11f5c7e..6bad899289 100644 --- a/flyteadmin/auth/cookie_manager_test.go +++ b/flyteadmin/auth/cookie_manager_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/oauth2" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" ) func TestCookieManager_SetTokenCookies(t *testing.T) { diff --git a/flyteadmin/auth/cookie_test.go b/flyteadmin/auth/cookie_test.go index b525ba8b4e..7a1a6ea61d 100644 --- a/flyteadmin/auth/cookie_test.go +++ b/flyteadmin/auth/cookie_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - "github.com/flyteorg/flyteadmin/auth/config" - "github.com/flyteorg/flyteadmin/auth/interfaces/mocks" - stdConfig "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" "github.com/gorilla/securecookie" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/auth/create_secrets.go b/flyteadmin/auth/create_secrets.go index a63dd61228..2f831571aa 100644 --- a/flyteadmin/auth/create_secrets.go +++ b/flyteadmin/auth/create_secrets.go @@ -10,18 +10,18 @@ import ( "k8s.io/client-go/rest" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" kubeErrors "k8s.io/apimachinery/pkg/api/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flyteadmin/pkg/config" - executioncluster "github.com/flyteorg/flyteadmin/pkg/executioncluster/impl" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - "github.com/flyteorg/flyteadmin/pkg/runtime" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" + executioncluster "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/impl" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/flyteadmin/auth/handler_utils.go b/flyteadmin/auth/handler_utils.go index f1487d3ae4..18a9d781dd 100644 --- a/flyteadmin/auth/handler_utils.go +++ b/flyteadmin/auth/handler_utils.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils" ) diff --git a/flyteadmin/auth/handler_utils_test.go b/flyteadmin/auth/handler_utils_test.go index 2e69dc4df2..fe5c9db135 100644 --- a/flyteadmin/auth/handler_utils_test.go +++ b/flyteadmin/auth/handler_utils_test.go @@ -6,9 +6,9 @@ import ( "testing" - config2 "github.com/flyteorg/flytestdlib/config" + config2 "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/auth/handlers.go b/flyteadmin/auth/handlers.go index 0ee2cc776e..413d67143f 100644 --- a/flyteadmin/auth/handlers.go +++ b/flyteadmin/auth/handlers.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils" "golang.org/x/oauth2" "google.golang.org/grpc" @@ -20,9 +20,9 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/runtime/protoiface" - "github.com/flyteorg/flyteadmin/auth/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/plugins" ) const ( diff --git a/flyteadmin/auth/handlers_test.go b/flyteadmin/auth/handlers_test.go index 449b13c4a5..911f037a1d 100644 --- a/flyteadmin/auth/handlers_test.go +++ b/flyteadmin/auth/handlers_test.go @@ -16,13 +16,13 @@ import ( "golang.org/x/oauth2" "google.golang.org/protobuf/types/known/structpb" - "github.com/flyteorg/flyteadmin/auth/config" - "github.com/flyteorg/flyteadmin/auth/interfaces" - "github.com/flyteorg/flyteadmin/auth/interfaces/mocks" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/plugins" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - stdConfig "github.com/flyteorg/flytestdlib/config" ) const ( diff --git a/flyteadmin/auth/identity_context.go b/flyteadmin/auth/identity_context.go index f1cfabe188..8d3643410a 100644 --- a/flyteadmin/auth/identity_context.go +++ b/flyteadmin/auth/identity_context.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" diff --git a/flyteadmin/auth/init_secrets.go b/flyteadmin/auth/init_secrets.go index e272a17cf8..0cccf74cc9 100644 --- a/flyteadmin/auth/init_secrets.go +++ b/flyteadmin/auth/init_secrets.go @@ -12,9 +12,9 @@ import ( "os" "path/filepath" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/spf13/cobra" ) diff --git a/flyteadmin/auth/interceptor.go b/flyteadmin/auth/interceptor.go index 0e141a34b6..c347dd63c4 100644 --- a/flyteadmin/auth/interceptor.go +++ b/flyteadmin/auth/interceptor.go @@ -3,7 +3,7 @@ package auth import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/auth/interfaces/context.go b/flyteadmin/auth/interfaces/context.go index e872342bb3..a26742e387 100644 --- a/flyteadmin/auth/interfaces/context.go +++ b/flyteadmin/auth/interfaces/context.go @@ -16,7 +16,7 @@ import ( fositeOAuth2 "github.com/ory/fosite/handler/oauth2" "github.com/coreos/go-oidc" - "github.com/flyteorg/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/config" "golang.org/x/oauth2" ) diff --git a/flyteadmin/auth/interfaces/mocks/authentication_context.go b/flyteadmin/auth/interfaces/mocks/authentication_context.go index 5b31986f7a..8115c48e89 100644 --- a/flyteadmin/auth/interfaces/mocks/authentication_context.go +++ b/flyteadmin/auth/interfaces/mocks/authentication_context.go @@ -5,9 +5,9 @@ package mocks import ( http "net/http" - config "github.com/flyteorg/flyteadmin/auth/config" + config "github.com/flyteorg/flyte/flyteadmin/auth/config" - interfaces "github.com/flyteorg/flyteadmin/auth/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" mock "github.com/stretchr/testify/mock" diff --git a/flyteadmin/auth/interfaces/mocks/o_auth2_provider.go b/flyteadmin/auth/interfaces/mocks/o_auth2_provider.go index bef11d0bdf..b01f24e877 100644 --- a/flyteadmin/auth/interfaces/mocks/o_auth2_provider.go +++ b/flyteadmin/auth/interfaces/mocks/o_auth2_provider.go @@ -9,7 +9,7 @@ import ( http "net/http" - interfaces "github.com/flyteorg/flyteadmin/auth/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" jwk "github.com/lestrrat-go/jwx/jwk" diff --git a/flyteadmin/auth/interfaces/mocks/o_auth2_resource_server.go b/flyteadmin/auth/interfaces/mocks/o_auth2_resource_server.go index 41baf01f67..1c360ffe84 100644 --- a/flyteadmin/auth/interfaces/mocks/o_auth2_resource_server.go +++ b/flyteadmin/auth/interfaces/mocks/o_auth2_resource_server.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - interfaces "github.com/flyteorg/flyteadmin/auth/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/auth/token.go b/flyteadmin/auth/token.go index e358a230f6..5ce16835d1 100644 --- a/flyteadmin/auth/token.go +++ b/flyteadmin/auth/token.go @@ -12,11 +12,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" "github.com/coreos/go-oidc" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" grpcauth "github.com/grpc-ecosystem/go-grpc-middleware/auth" "golang.org/x/oauth2" ) diff --git a/flyteadmin/boilerplate/flyte/golang_support_tools/tools.go b/flyteadmin/boilerplate/flyte/golang_support_tools/tools.go index 43de03450c..a78b61162a 100644 --- a/flyteadmin/boilerplate/flyte/golang_support_tools/tools.go +++ b/flyteadmin/boilerplate/flyte/golang_support_tools/tools.go @@ -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" ) diff --git a/flyteadmin/cmd/entrypoints/clusterresource.go b/flyteadmin/cmd/entrypoints/clusterresource.go index 4091ce25d3..fa38491b62 100644 --- a/flyteadmin/cmd/entrypoints/clusterresource.go +++ b/flyteadmin/cmd/entrypoints/clusterresource.go @@ -5,11 +5,11 @@ import ( errors2 "github.com/pkg/errors" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flyteadmin/pkg/clusterresource" - "github.com/flyteorg/flyteadmin/pkg/runtime" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/pkg/clusterresource" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/spf13/cobra" _ "gorm.io/driver/postgres" // Required to import database driver. diff --git a/flyteadmin/cmd/entrypoints/k8s_secret.go b/flyteadmin/cmd/entrypoints/k8s_secret.go index 353f47f0d5..7a24f70dba 100644 --- a/flyteadmin/cmd/entrypoints/k8s_secret.go +++ b/flyteadmin/cmd/entrypoints/k8s_secret.go @@ -1,7 +1,7 @@ package entrypoints import ( - "github.com/flyteorg/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth" "github.com/spf13/cobra" ) diff --git a/flyteadmin/cmd/entrypoints/migrate.go b/flyteadmin/cmd/entrypoints/migrate.go index 030a39390e..bb0d79788b 100644 --- a/flyteadmin/cmd/entrypoints/migrate.go +++ b/flyteadmin/cmd/entrypoints/migrate.go @@ -3,7 +3,7 @@ package entrypoints import ( "context" - "github.com/flyteorg/flyteadmin/pkg/server" + "github.com/flyteorg/flyte/flyteadmin/pkg/server" "github.com/spf13/cobra" _ "gorm.io/driver/postgres" // Required to import database driver. diff --git a/flyteadmin/cmd/entrypoints/root.go b/flyteadmin/cmd/entrypoints/root.go index 7e222a7560..04775b47ee 100644 --- a/flyteadmin/cmd/entrypoints/root.go +++ b/flyteadmin/cmd/entrypoints/root.go @@ -6,12 +6,12 @@ import ( "fmt" "os" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/plugins" - "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" ) diff --git a/flyteadmin/cmd/entrypoints/serve.go b/flyteadmin/cmd/entrypoints/serve.go index 3b7c0c2552..56eb4483e9 100644 --- a/flyteadmin/cmd/entrypoints/serve.go +++ b/flyteadmin/cmd/entrypoints/serve.go @@ -3,18 +3,18 @@ package entrypoints import ( "context" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/plugins" - "github.com/flyteorg/flytestdlib/profutils" + "github.com/flyteorg/flyte/flytestdlib/profutils" _ "net/http/pprof" // Required to serve application. - "github.com/flyteorg/flyteadmin/pkg/server" + "github.com/flyteorg/flyte/flyteadmin/pkg/server" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/spf13/cobra" - runtimeConfig "github.com/flyteorg/flyteadmin/pkg/runtime" + runtimeConfig "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" ) var pluginRegistryStore = plugins.NewAtomicRegistry(plugins.NewRegistry()) diff --git a/flyteadmin/cmd/main.go b/flyteadmin/cmd/main.go index 1c3d31d061..d64c8a5dbf 100644 --- a/flyteadmin/cmd/main.go +++ b/flyteadmin/cmd/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/flyteorg/flyteadmin/cmd/entrypoints" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/cmd/entrypoints" + "github.com/flyteorg/flyte/flyteadmin/plugins" "github.com/golang/glog" ) diff --git a/flyteadmin/cmd/scheduler/entrypoints/precheck.go b/flyteadmin/cmd/scheduler/entrypoints/precheck.go index ee25bc48c3..89e5d22800 100644 --- a/flyteadmin/cmd/scheduler/entrypoints/precheck.go +++ b/flyteadmin/cmd/scheduler/entrypoints/precheck.go @@ -4,8 +4,8 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin" - "github.com/flyteorg/flytestdlib/logger" "github.com/spf13/cobra" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/flyteadmin/cmd/scheduler/entrypoints/root.go b/flyteadmin/cmd/scheduler/entrypoints/root.go index a00a537cd1..1f37a11df9 100644 --- a/flyteadmin/cmd/scheduler/entrypoints/root.go +++ b/flyteadmin/cmd/scheduler/entrypoints/root.go @@ -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" ) diff --git a/flyteadmin/cmd/scheduler/entrypoints/scheduler.go b/flyteadmin/cmd/scheduler/entrypoints/scheduler.go index 486a5a8fe0..15935bcb04 100644 --- a/flyteadmin/cmd/scheduler/entrypoints/scheduler.go +++ b/flyteadmin/cmd/scheduler/entrypoints/scheduler.go @@ -3,12 +3,12 @@ package entrypoints import ( "context" - "github.com/flyteorg/flyteadmin/pkg/server" + "github.com/flyteorg/flyte/flyteadmin/pkg/server" - "github.com/flyteorg/flyteadmin/pkg/runtime" - "github.com/flyteorg/flyteadmin/scheduler" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/profutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flyteadmin/scheduler" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/profutils" "github.com/spf13/cobra" _ "gorm.io/driver/postgres" // Required to import database driver. ) diff --git a/flyteadmin/cmd/scheduler/main.go b/flyteadmin/cmd/scheduler/main.go index 7e20f355f5..9b12d85116 100644 --- a/flyteadmin/cmd/scheduler/main.go +++ b/flyteadmin/cmd/scheduler/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/flyteorg/flyteadmin/cmd/scheduler/entrypoints" + "github.com/flyteorg/flyte/flyteadmin/cmd/scheduler/entrypoints" "github.com/golang/glog" ) diff --git a/flyteadmin/dataproxy/service.go b/flyteadmin/dataproxy/service.go index 23d48bf6f2..d35ea7832d 100644 --- a/flyteadmin/dataproxy/service.go +++ b/flyteadmin/dataproxy/service.go @@ -12,26 +12,26 @@ import ( "strings" "time" - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" "google.golang.org/protobuf/types/known/durationpb" - "github.com/flyteorg/flyteadmin/pkg/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/stow" "k8s.io/apimachinery/pkg/util/rand" diff --git a/flyteadmin/dataproxy/service_test.go b/flyteadmin/dataproxy/service_test.go index 7477b2aa4a..2e69e3b027 100644 --- a/flyteadmin/dataproxy/service_test.go +++ b/flyteadmin/dataproxy/service_test.go @@ -13,21 +13,21 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - stdlibConfig "github.com/flyteorg/flytestdlib/config" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + stdlibConfig "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "google.golang.org/protobuf/types/known/durationpb" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flyteadmin/pkg/config" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/go.mod b/flyteadmin/go.mod index b30095519e..60015b34b6 100644 --- a/flyteadmin/go.mod +++ b/flyteadmin/go.mod @@ -1,4 +1,4 @@ -module github.com/flyteorg/flyteadmin +module github.com/flyteorg/flyte/flyteadmin go 1.19 @@ -13,10 +13,10 @@ require ( github.com/cloudevents/sdk-go/v2 v2.8.0 github.com/coreos/go-oidc v2.2.1+incompatible github.com/evanphx/json-patch v4.12.0+incompatible - github.com/flyteorg/flyteidl v1.5.14 - github.com/flyteorg/flyteplugins v1.0.67 - github.com/flyteorg/flytepropeller v1.1.98 - github.com/flyteorg/flytestdlib v1.0.22 + github.com/flyteorg/flyte/flyteplugins v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyte/flytepropeller v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyteidl v0.0.0-00010101000000-000000000000 github.com/flyteorg/stow v0.3.7 github.com/ghodss/yaml v1.0.0 github.com/go-gormigrate/gormigrate/v2 v2.0.0 @@ -79,8 +79,6 @@ require ( github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -93,14 +91,14 @@ require ( github.com/eapache/go-resiliency v1.2.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/emicklei/go-restful/v3 v3.8.0 // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/go-logr/logr v1.2.3 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.19.5 // indirect - github.com/go-openapi/swag v0.19.14 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.1 // indirect + github.com/go-openapi/swag v0.22.3 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-test/deep v1.0.7 // indirect github.com/goccy/go-json v0.4.8 // indirect @@ -136,7 +134,7 @@ require ( github.com/lestrrat-go/iter v1.0.1 // indirect github.com/lestrrat-go/option v1.0.0 // indirect github.com/lib/pq v1.10.4 // indirect - github.com/mailru/easyjson v0.7.6 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect @@ -187,7 +185,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.24.1 // indirect - sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) @@ -202,14 +200,22 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.1 // indirect - k8s.io/klog/v2 v2.70.1 // indirect - k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect + k8s.io/klog/v2 v2.90.1 // indirect + k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect + k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) -replace github.com/robfig/cron/v3 => github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a - // Retracted versions // This was published in error when attempting to create 1.5.1 Flyte release. retract v1.1.94 + +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 + github.com/robfig/cron/v3 => github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a +) diff --git a/flyteadmin/go.sum b/flyteadmin/go.sum index ed4b6ac859..2aecc452e4 100644 --- a/flyteadmin/go.sum +++ b/flyteadmin/go.sum @@ -112,9 +112,7 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Selvatico/go-mocket v1.0.7 h1:sXuFMnMfVL9b/Os8rGXPgbOFbr4HJm8aHsulD/uMTUk= github.com/Selvatico/go-mocket v1.0.7/go.mod h1:4gO2v+uQmsL+jzQgLANy3tyEFzaEzHlymVbZ3GP2Oes= @@ -272,8 +270,8 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg github.com/elazarl/goproxy v0.0.0-20181003060214-f58a169a71a5/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= -github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= +github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -293,14 +291,6 @@ github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flyteorg/flyteidl v1.5.14 h1:+3ewipoOp82fPyIVgvvrMq1lorl5Kz3Lh6sh/a9+loI= -github.com/flyteorg/flyteidl v1.5.14/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flyteplugins v1.0.67 h1:d2FXpwxQwX/k4YdmhuusykOemHb/cUTPEob4WBmdpjE= -github.com/flyteorg/flyteplugins v1.0.67/go.mod h1:HHt4nKDKVwrZPKDsj99dNtDSIJL378xNotYMA3a/TFA= -github.com/flyteorg/flytepropeller v1.1.98 h1:Zk2ENYB9VZRT5tFUIFjm+aCkr0TU2EuyJ5gh52fpLoA= -github.com/flyteorg/flytepropeller v1.1.98/go.mod h1:R0CB6Uzp9F4YyvPmLRE7XyXxDebAPFD+LbHTf07mBzI= -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/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -359,14 +349,16 @@ github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= +github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= @@ -397,8 +389,9 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= -github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= @@ -997,8 +990,9 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -1042,8 +1036,9 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/deplist v1.0.4/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM= github.com/markbates/deplist v1.0.5/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM= github.com/markbates/deplist v1.1.3/go.mod h1:BF7ioVzAJYEtzQN/os4rt8H8Ti3h0T7EoN+7eyALktE= @@ -1139,7 +1134,6 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks= github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -2113,8 +2107,9 @@ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod 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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= @@ -2213,15 +2208,15 @@ k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= -k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= +k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= -k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= +k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= @@ -2235,8 +2230,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lR sigs.k8s.io/controller-runtime v0.12.1 h1:4BJY01xe9zKQti8oRjj/NeHKRXthf1YkYJAgLONFFoI= sigs.k8s.io/controller-runtime v0.12.1/go.mod h1:BKhxlA4l7FPK4AQcsuL4X6vZeWnKDXez/vp1Y8dxTU0= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= -sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/flyteadmin/pkg/async/cloudevent/factory.go b/flyteadmin/pkg/async/cloudevent/factory.go index a43d8749b5..976aa34532 100644 --- a/flyteadmin/pkg/async/cloudevent/factory.go +++ b/flyteadmin/pkg/async/cloudevent/factory.go @@ -10,14 +10,14 @@ import ( "github.com/Shopify/sarama" "github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2" cloudevents "github.com/cloudevents/sdk-go/v2" - "github.com/flyteorg/flyteadmin/pkg/async" - cloudEventImplementations "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/implementations" - "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/interfaces" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/implementations" - "github.com/flyteorg/flyteadmin/pkg/common" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" + cloudEventImplementations "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent/implementations" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/implementations" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) func NewCloudEventsPublisher(ctx context.Context, config runtimeInterfaces.CloudEventsConfig, scope promutils.Scope) interfaces.Publisher { diff --git a/flyteadmin/pkg/async/cloudevent/factory_test.go b/flyteadmin/pkg/async/cloudevent/factory_test.go index 00ac69380f..e5ccdbee22 100644 --- a/flyteadmin/pkg/async/cloudevent/factory_test.go +++ b/flyteadmin/pkg/async/cloudevent/factory_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/implementations" - "github.com/flyteorg/flyteadmin/pkg/common" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent/implementations" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go b/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go index 53dba62d4b..ac9ab99815 100644 --- a/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go +++ b/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go @@ -11,16 +11,16 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/implementations" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/implementations" cloudevents "github.com/cloudevents/sdk-go/v2" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent/interfaces" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher_test.go b/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher_test.go index 3da13d9d39..10222530a6 100644 --- a/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher_test.go +++ b/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher_test.go @@ -18,7 +18,7 @@ import ( "github.com/NYTimes/gizmo/pubsub/pubsubtest" pbcloudevents "github.com/cloudevents/sdk-go/binding/format/protobuf/v2" cloudevents "github.com/cloudevents/sdk-go/v2" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/cloudevent/implementations/sender.go b/flyteadmin/pkg/async/cloudevent/implementations/sender.go index 0b0c6f9ebf..263e4cfd56 100644 --- a/flyteadmin/pkg/async/cloudevent/implementations/sender.go +++ b/flyteadmin/pkg/async/cloudevent/implementations/sender.go @@ -9,7 +9,7 @@ import ( pbcloudevents "github.com/cloudevents/sdk-go/binding/format/protobuf/v2" "github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2" cloudevents "github.com/cloudevents/sdk-go/v2" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) type Receiver = string diff --git a/flyteadmin/pkg/async/events/implementations/node_execution_event_writer.go b/flyteadmin/pkg/async/events/implementations/node_execution_event_writer.go index 7dd0c7cbdd..30ee12f6d3 100644 --- a/flyteadmin/pkg/async/events/implementations/node_execution_event_writer.go +++ b/flyteadmin/pkg/async/events/implementations/node_execution_event_writer.go @@ -3,12 +3,12 @@ package implementations import ( "context" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/async/events/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/events/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" ) // This event writer acts to asynchronously persist node execution events. As flytepropeller sends node diff --git a/flyteadmin/pkg/async/events/implementations/node_execution_event_writer_test.go b/flyteadmin/pkg/async/events/implementations/node_execution_event_writer_test.go index fa6bb3130b..573b9c32a6 100644 --- a/flyteadmin/pkg/async/events/implementations/node_execution_event_writer_test.go +++ b/flyteadmin/pkg/async/events/implementations/node_execution_event_writer_test.go @@ -3,7 +3,7 @@ package implementations import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" event2 "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer.go b/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer.go index c9be3f0e4b..35c973340f 100644 --- a/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer.go +++ b/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer.go @@ -3,12 +3,12 @@ package implementations import ( "context" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/async/events/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/events/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" ) // This event writer acts to asynchronously persist workflow execution events. As flytepropeller sends workflow diff --git a/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer_test.go b/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer_test.go index 03a6134cc1..dbd5f6d6d2 100644 --- a/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer_test.go +++ b/flyteadmin/pkg/async/events/implementations/workflow_execution_event_writer_test.go @@ -3,7 +3,7 @@ package implementations import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" event2 "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flyteadmin/pkg/async/notifications/email.go b/flyteadmin/pkg/async/notifications/email.go index 063acf335b..5898066e51 100644 --- a/flyteadmin/pkg/async/notifications/email.go +++ b/flyteadmin/pkg/async/notifications/email.go @@ -5,7 +5,7 @@ import ( "strings" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/async/notifications/email_test.go b/flyteadmin/pkg/async/notifications/email_test.go index 612cc4adfb..37dc7b9ffe 100644 --- a/flyteadmin/pkg/async/notifications/email_test.go +++ b/flyteadmin/pkg/async/notifications/email_test.go @@ -6,7 +6,7 @@ import ( "strings" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "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/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flyteadmin/pkg/async/notifications/factory.go b/flyteadmin/pkg/async/notifications/factory.go index a2fd4c3570..54496376dd 100644 --- a/flyteadmin/pkg/async/notifications/factory.go +++ b/flyteadmin/pkg/async/notifications/factory.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "github.com/flyteorg/flyteadmin/pkg/async" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/implementations" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/implementations" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/NYTimes/gizmo/pubsub" gizmoAWS "github.com/NYTimes/gizmo/pubsub/aws" @@ -20,8 +20,8 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ses" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) const maxRetries = 3 diff --git a/flyteadmin/pkg/async/notifications/factory_test.go b/flyteadmin/pkg/async/notifications/factory_test.go index c10bab230f..5b5cc05041 100644 --- a/flyteadmin/pkg/async/notifications/factory_test.go +++ b/flyteadmin/pkg/async/notifications/factory_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/implementations" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/implementations" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/aws_emailer.go b/flyteadmin/pkg/async/notifications/implementations/aws_emailer.go index 7f1858fb4a..ebacb8f880 100644 --- a/flyteadmin/pkg/async/notifications/implementations/aws_emailer.go +++ b/flyteadmin/pkg/async/notifications/implementations/aws_emailer.go @@ -5,12 +5,12 @@ import ( "github.com/aws/aws-sdk-go/service/ses" "github.com/aws/aws-sdk-go/service/ses/sesiface" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "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/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/aws_emailer_test.go b/flyteadmin/pkg/async/notifications/implementations/aws_emailer_test.go index 0fba2449c9..a77d47724e 100644 --- a/flyteadmin/pkg/async/notifications/implementations/aws_emailer_test.go +++ b/flyteadmin/pkg/async/notifications/implementations/aws_emailer_test.go @@ -8,10 +8,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ses" "github.com/aws/aws-sdk-go/service/ses/sesiface" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/mocks" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "github.com/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/aws_processor.go b/flyteadmin/pkg/async/notifications/implementations/aws_processor.go index 2cbf6d971a..5ed0327615 100644 --- a/flyteadmin/pkg/async/notifications/implementations/aws_processor.go +++ b/flyteadmin/pkg/async/notifications/implementations/aws_processor.go @@ -7,11 +7,11 @@ import ( "time" "github.com/NYTimes/gizmo/pubsub" - "github.com/flyteorg/flyteadmin/pkg/async" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/aws_processor_test.go b/flyteadmin/pkg/async/notifications/implementations/aws_processor_test.go index 6dfcec1e80..bf7b3d7127 100644 --- a/flyteadmin/pkg/async/notifications/implementations/aws_processor_test.go +++ b/flyteadmin/pkg/async/notifications/implementations/aws_processor_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/email_metrics.go b/flyteadmin/pkg/async/notifications/implementations/email_metrics.go index f07ab2ea42..00195b3d26 100644 --- a/flyteadmin/pkg/async/notifications/implementations/email_metrics.go +++ b/flyteadmin/pkg/async/notifications/implementations/email_metrics.go @@ -1,7 +1,7 @@ package implementations import ( - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/event_publisher.go b/flyteadmin/pkg/async/notifications/implementations/event_publisher.go index 69d61c32a3..e2210f3e94 100644 --- a/flyteadmin/pkg/async/notifications/implementations/event_publisher.go +++ b/flyteadmin/pkg/async/notifications/implementations/event_publisher.go @@ -7,11 +7,11 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" "github.com/NYTimes/gizmo/pubsub" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/event_publisher_test.go b/flyteadmin/pkg/async/notifications/implementations/event_publisher_test.go index f4960cf2ba..b75a5e6a10 100644 --- a/flyteadmin/pkg/async/notifications/implementations/event_publisher_test.go +++ b/flyteadmin/pkg/async/notifications/implementations/event_publisher_test.go @@ -13,7 +13,7 @@ import ( "github.com/NYTimes/gizmo/pubsub" "github.com/NYTimes/gizmo/pubsub/pubsubtest" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/gcp_processor.go b/flyteadmin/pkg/async/notifications/implementations/gcp_processor.go index 0ce49371e3..b5eee6a607 100644 --- a/flyteadmin/pkg/async/notifications/implementations/gcp_processor.go +++ b/flyteadmin/pkg/async/notifications/implementations/gcp_processor.go @@ -5,11 +5,11 @@ import ( "time" "github.com/NYTimes/gizmo/pubsub" - "github.com/flyteorg/flyteadmin/pkg/async" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/gcp_processor_test.go b/flyteadmin/pkg/async/notifications/implementations/gcp_processor_test.go index 2aa216d296..9282749fe0 100644 --- a/flyteadmin/pkg/async/notifications/implementations/gcp_processor_test.go +++ b/flyteadmin/pkg/async/notifications/implementations/gcp_processor_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/NYTimes/gizmo/pubsub/pubsubtest" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "github.com/pkg/errors" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/async/notifications/implementations/noop_notifications.go b/flyteadmin/pkg/async/notifications/implementations/noop_notifications.go index 74ac166fa2..de3ed8553b 100644 --- a/flyteadmin/pkg/async/notifications/implementations/noop_notifications.go +++ b/flyteadmin/pkg/async/notifications/implementations/noop_notifications.go @@ -3,10 +3,10 @@ package implementations import ( "context" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" "strings" diff --git a/flyteadmin/pkg/async/notifications/implementations/processor_metrics.go b/flyteadmin/pkg/async/notifications/implementations/processor_metrics.go index adc4219f96..938ce2b325 100644 --- a/flyteadmin/pkg/async/notifications/implementations/processor_metrics.go +++ b/flyteadmin/pkg/async/notifications/implementations/processor_metrics.go @@ -1,7 +1,7 @@ package implementations import ( - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/publisher.go b/flyteadmin/pkg/async/notifications/implementations/publisher.go index b8ec7047c5..d168e51083 100644 --- a/flyteadmin/pkg/async/notifications/implementations/publisher.go +++ b/flyteadmin/pkg/async/notifications/implementations/publisher.go @@ -3,11 +3,11 @@ package implementations import ( "context" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" "github.com/NYTimes/gizmo/pubsub" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/publisher_test.go b/flyteadmin/pkg/async/notifications/implementations/publisher_test.go index 7aa732450f..4af33c904e 100644 --- a/flyteadmin/pkg/async/notifications/implementations/publisher_test.go +++ b/flyteadmin/pkg/async/notifications/implementations/publisher_test.go @@ -9,9 +9,9 @@ import ( "github.com/NYTimes/gizmo/pubsub" "github.com/NYTimes/gizmo/pubsub/pubsubtest" "github.com/aws/aws-sdk-go/aws" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/sandbox_processor.go b/flyteadmin/pkg/async/notifications/implementations/sandbox_processor.go index 4b89f277aa..34aea291a1 100644 --- a/flyteadmin/pkg/async/notifications/implementations/sandbox_processor.go +++ b/flyteadmin/pkg/async/notifications/implementations/sandbox_processor.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/flyteorg/flyteadmin/pkg/async" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/sandbox_processor_test.go b/flyteadmin/pkg/async/notifications/implementations/sandbox_processor_test.go index 6bbee8cf51..ea765ec08b 100644 --- a/flyteadmin/pkg/async/notifications/implementations/sandbox_processor_test.go +++ b/flyteadmin/pkg/async/notifications/implementations/sandbox_processor_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/async/notifications/implementations/sandbox_publisher.go b/flyteadmin/pkg/async/notifications/implementations/sandbox_publisher.go index ab94b1ee66..c023d429bb 100644 --- a/flyteadmin/pkg/async/notifications/implementations/sandbox_publisher.go +++ b/flyteadmin/pkg/async/notifications/implementations/sandbox_publisher.go @@ -3,7 +3,7 @@ package implementations import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer.go b/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer.go index 61e0de4005..5631a61876 100644 --- a/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer.go +++ b/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer.go @@ -9,11 +9,11 @@ import ( "github.com/sendgrid/sendgrid-go" "github.com/sendgrid/sendgrid-go/helpers/mail" - "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" ) type SendgridEmailer struct { diff --git a/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer_test.go b/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer_test.go index ea6787f903..5d7039de51 100644 --- a/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer_test.go +++ b/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer_test.go @@ -6,9 +6,9 @@ import ( "path" "testing" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler.go b/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler.go index 6a1b1daa77..bd77fed861 100644 --- a/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler.go +++ b/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/aws/interfaces" - scheduleInterfaces "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - appInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/aws/interfaces" + 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/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/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" diff --git a/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler_test.go b/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler_test.go index d4750c2ae9..52402f7e63 100644 --- a/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler_test.go +++ b/flyteadmin/pkg/async/schedule/aws/cloud_watch_scheduler_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/aws/interfaces" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/aws/mocks" - scheduleInterfaces "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/aws/interfaces" + "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/flytestdlib/promutils" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatchevents" diff --git a/flyteadmin/pkg/async/schedule/aws/mocks/mock_cloud_watch_event_client.go b/flyteadmin/pkg/async/schedule/aws/mocks/mock_cloud_watch_event_client.go index a0e7740919..c7bdb4c0fc 100644 --- a/flyteadmin/pkg/async/schedule/aws/mocks/mock_cloud_watch_event_client.go +++ b/flyteadmin/pkg/async/schedule/aws/mocks/mock_cloud_watch_event_client.go @@ -2,7 +2,7 @@ package mocks import ( "github.com/aws/aws-sdk-go/service/cloudwatchevents" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/aws/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/aws/interfaces" ) type putRuleFunc func(input *cloudwatchevents.PutRuleInput) (*cloudwatchevents.PutRuleOutput, error) diff --git a/flyteadmin/pkg/async/schedule/aws/serialization.go b/flyteadmin/pkg/async/schedule/aws/serialization.go index 940d3ed3cd..0540ee1a31 100644 --- a/flyteadmin/pkg/async/schedule/aws/serialization.go +++ b/flyteadmin/pkg/async/schedule/aws/serialization.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/async/schedule/aws/serialization_test.go b/flyteadmin/pkg/async/schedule/aws/serialization_test.go index 3a41fd8e3a..719bab6c66 100644 --- a/flyteadmin/pkg/async/schedule/aws/serialization_test.go +++ b/flyteadmin/pkg/async/schedule/aws/serialization_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/async/schedule/aws/shared.go b/flyteadmin/pkg/async/schedule/aws/shared.go index a3162fbb83..65207cb8d8 100644 --- a/flyteadmin/pkg/async/schedule/aws/shared.go +++ b/flyteadmin/pkg/async/schedule/aws/shared.go @@ -5,8 +5,8 @@ import ( "fmt" "hash/fnv" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" ) func hashIdentifier(identifier core.Identifier) uint64 { diff --git a/flyteadmin/pkg/async/schedule/aws/workflow_executor.go b/flyteadmin/pkg/async/schedule/aws/workflow_executor.go index b67b53fd0b..f19362021d 100644 --- a/flyteadmin/pkg/async/schedule/aws/workflow_executor.go +++ b/flyteadmin/pkg/async/schedule/aws/workflow_executor.go @@ -6,29 +6,29 @@ import ( "fmt" "time" - "github.com/flyteorg/flyteadmin/pkg/async" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "github.com/golang/protobuf/ptypes/timestamp" - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/prometheus/client_golang/prometheus" - scheduleInterfaces "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" + scheduleInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/ptypes" "github.com/NYTimes/gizmo/pubsub" "github.com/NYTimes/gizmo/pubsub/aws" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/async/schedule/aws/workflow_executor_test.go b/flyteadmin/pkg/async/schedule/aws/workflow_executor_test.go index c2bb515272..8d8b01df1b 100644 --- a/flyteadmin/pkg/async/schedule/aws/workflow_executor_test.go +++ b/flyteadmin/pkg/async/schedule/aws/workflow_executor_test.go @@ -6,20 +6,20 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/NYTimes/gizmo/pubsub/pubsubtest" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" "github.com/NYTimes/gizmo/pubsub" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/ptypes" diff --git a/flyteadmin/pkg/async/schedule/factory.go b/flyteadmin/pkg/async/schedule/factory.go index 3b86d33f57..59d054ea49 100644 --- a/flyteadmin/pkg/async/schedule/factory.go +++ b/flyteadmin/pkg/async/schedule/factory.go @@ -4,21 +4,21 @@ import ( "context" "time" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" gizmoConfig "github.com/NYTimes/gizmo/pubsub/aws" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" - "github.com/flyteorg/flyteadmin/pkg/async" - awsSchedule "github.com/flyteorg/flyteadmin/pkg/async/schedule/aws" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/noop" - "github.com/flyteorg/flyteadmin/pkg/common" - managerInterfaces "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - flytescheduler "github.com/flyteorg/flyteadmin/scheduler/dbapi" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" + awsSchedule "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/aws" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/noop" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + managerInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + flytescheduler "github.com/flyteorg/flyte/flyteadmin/scheduler/dbapi" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type WorkflowSchedulerConfig struct { diff --git a/flyteadmin/pkg/async/schedule/interfaces/event_scheduler.go b/flyteadmin/pkg/async/schedule/interfaces/event_scheduler.go index 11252d24a4..3871faa6a9 100644 --- a/flyteadmin/pkg/async/schedule/interfaces/event_scheduler.go +++ b/flyteadmin/pkg/async/schedule/interfaces/event_scheduler.go @@ -4,7 +4,7 @@ package interfaces import ( "context" - appInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + 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" ) diff --git a/flyteadmin/pkg/async/schedule/mocks/mock_event_scheduler.go b/flyteadmin/pkg/async/schedule/mocks/mock_event_scheduler.go index 1d63ddf42c..92d72bbfb6 100644 --- a/flyteadmin/pkg/async/schedule/mocks/mock_event_scheduler.go +++ b/flyteadmin/pkg/async/schedule/mocks/mock_event_scheduler.go @@ -3,9 +3,9 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/aws" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/aws" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" + runtimeInterfaces "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" ) diff --git a/flyteadmin/pkg/async/schedule/noop/event_scheduler.go b/flyteadmin/pkg/async/schedule/noop/event_scheduler.go index 42d2eefe6f..cc49113495 100644 --- a/flyteadmin/pkg/async/schedule/noop/event_scheduler.go +++ b/flyteadmin/pkg/async/schedule/noop/event_scheduler.go @@ -4,11 +4,11 @@ package noop import ( "context" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "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/flytestdlib/logger" ) type EventScheduler struct{} diff --git a/flyteadmin/pkg/async/schedule/noop/workflow_executor.go b/flyteadmin/pkg/async/schedule/noop/workflow_executor.go index e6243c4473..89c86ed19a 100644 --- a/flyteadmin/pkg/async/schedule/noop/workflow_executor.go +++ b/flyteadmin/pkg/async/schedule/noop/workflow_executor.go @@ -1,6 +1,6 @@ package noop -import "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" +import "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" type workflowExecutor struct{} diff --git a/flyteadmin/pkg/async/shared.go b/flyteadmin/pkg/async/shared.go index c3df15dd35..9fafb50479 100644 --- a/flyteadmin/pkg/async/shared.go +++ b/flyteadmin/pkg/async/shared.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) // RetryDelay indicates how long to wait between restarting a subscriber connection in the case of network failures. diff --git a/flyteadmin/pkg/clusterresource/controller.go b/flyteadmin/pkg/clusterresource/controller.go index 36b62caa00..7e5fe6610d 100644 --- a/flyteadmin/pkg/clusterresource/controller.go +++ b/flyteadmin/pkg/clusterresource/controller.go @@ -34,23 +34,23 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/restmapper" - impl2 "github.com/flyteorg/flyteadmin/pkg/clusterresource/impl" - "github.com/flyteorg/flyteadmin/pkg/clusterresource/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/config" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/impl" - executionclusterIfaces "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/resources" - "github.com/flyteorg/flyteadmin/pkg/repositories" - errors2 "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/runtime" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + impl2 "github.com/flyteorg/flyte/flyteadmin/pkg/clusterresource/impl" + "github.com/flyteorg/flyte/flyteadmin/pkg/clusterresource/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/impl" + executionclusterIfaces "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/resources" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" + 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" + "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" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" ) const namespaceVariable = "namespace" diff --git a/flyteadmin/pkg/clusterresource/controller_test.go b/flyteadmin/pkg/clusterresource/controller_test.go index c8594851ff..c43afcaaf2 100644 --- a/flyteadmin/pkg/clusterresource/controller_test.go +++ b/flyteadmin/pkg/clusterresource/controller_test.go @@ -7,14 +7,14 @@ import ( "os" "testing" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/clusterresource/mocks" - execClusterMocks "github.com/flyteorg/flyteadmin/pkg/executioncluster/mocks" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "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" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/flyteadmin/pkg/clusterresource/impl/admin_service_data_provider.go b/flyteadmin/pkg/clusterresource/impl/admin_service_data_provider.go index 1818d25ecb..e2635f345e 100644 --- a/flyteadmin/pkg/clusterresource/impl/admin_service_data_provider.go +++ b/flyteadmin/pkg/clusterresource/impl/admin_service_data_provider.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flyteadmin/pkg/clusterresource/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/clusterresource/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Implementation of an interfaces.FlyteAdminDataProvider which fetches data using a flyteadmin service client diff --git a/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider.go b/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider.go index 3612cb5ec5..05250c0548 100644 --- a/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider.go +++ b/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider.go @@ -3,12 +3,12 @@ package impl import ( "context" - "github.com/flyteorg/flyteadmin/pkg/clusterresource/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - managerInterfaces "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/clusterresource/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + managerInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider_test.go b/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider_test.go index 452a559950..dca0a7aec8 100644 --- a/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider_test.go +++ b/flyteadmin/pkg/clusterresource/impl/db_admin_data_provider_test.go @@ -5,13 +5,13 @@ import ( "errors" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repoMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - configMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repoMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + configMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/clusterresource/impl/shared.go b/flyteadmin/pkg/clusterresource/impl/shared.go index 7c911bcb14..f79510d1d4 100644 --- a/flyteadmin/pkg/clusterresource/impl/shared.go +++ b/flyteadmin/pkg/clusterresource/impl/shared.go @@ -1,7 +1,7 @@ package impl import ( - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/common/constants.go b/flyteadmin/pkg/common/constants.go index f67ac583e0..7df5860e44 100644 --- a/flyteadmin/pkg/common/constants.go +++ b/flyteadmin/pkg/common/constants.go @@ -1,6 +1,6 @@ package common -import "github.com/flyteorg/flytestdlib/contextutils" +import "github.com/flyteorg/flyte/flytestdlib/contextutils" var RuntimeTypeKey = contextutils.Key("runtime_type") var RuntimeVersionKey = contextutils.Key("runtime_version") diff --git a/flyteadmin/pkg/common/data_store.go b/flyteadmin/pkg/common/data_store.go index d9ccacd995..11f98db68e 100644 --- a/flyteadmin/pkg/common/data_store.go +++ b/flyteadmin/pkg/common/data_store.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/flyteorg/flyteadmin/pkg/async" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/async" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" errrs "github.com/pkg/errors" "google.golang.org/api/googleapi" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/common/data_store_test.go b/flyteadmin/pkg/common/data_store_test.go index aacae4e417..1241eeed6c 100644 --- a/flyteadmin/pkg/common/data_store_test.go +++ b/flyteadmin/pkg/common/data_store_test.go @@ -5,14 +5,14 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" errs "github.com/pkg/errors" "google.golang.org/api/googleapi" "google.golang.org/grpc/codes" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/common/filters.go b/flyteadmin/pkg/common/filters.go index 507984aa0d..11de489ad4 100644 --- a/flyteadmin/pkg/common/filters.go +++ b/flyteadmin/pkg/common/filters.go @@ -5,8 +5,8 @@ import ( "context" "fmt" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/common/mocks/storage.go b/flyteadmin/pkg/common/mocks/storage.go index d1555ebf47..af1dc0fc50 100644 --- a/flyteadmin/pkg/common/mocks/storage.go +++ b/flyteadmin/pkg/common/mocks/storage.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/common/sorting.go b/flyteadmin/pkg/common/sorting.go index df3096076c..966942ce32 100644 --- a/flyteadmin/pkg/common/sorting.go +++ b/flyteadmin/pkg/common/sorting.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" ) const gormDescending = "%s desc" diff --git a/flyteadmin/pkg/config/config.go b/flyteadmin/pkg/config/config.go index 28996bd236..30a5c49017 100644 --- a/flyteadmin/pkg/config/config.go +++ b/flyteadmin/pkg/config/config.go @@ -6,8 +6,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" - authConfig "github.com/flyteorg/flyteadmin/auth/config" - "github.com/flyteorg/flytestdlib/config" + authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) const SectionKey = "server" diff --git a/flyteadmin/pkg/data/factory.go b/flyteadmin/pkg/data/factory.go index e4bba5e27b..5e4f1f371e 100644 --- a/flyteadmin/pkg/data/factory.go +++ b/flyteadmin/pkg/data/factory.go @@ -5,16 +5,16 @@ import ( "time" "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/stow" "github.com/flyteorg/stow/s3" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/aws/aws-sdk-go/aws" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/data/implementations" - "github.com/flyteorg/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/data/implementations" + "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" ) type RemoteDataHandlerConfig struct { diff --git a/flyteadmin/pkg/data/implementations/aws_remote_url.go b/flyteadmin/pkg/data/implementations/aws_remote_url.go index 92c87c8448..59cfe4ad1f 100644 --- a/flyteadmin/pkg/data/implementations/aws_remote_url.go +++ b/flyteadmin/pkg/data/implementations/aws_remote_url.go @@ -10,10 +10,10 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" - "github.com/flyteorg/flyteadmin/pkg/data/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/data/implementations/gcp_remote_url.go b/flyteadmin/pkg/data/implementations/gcp_remote_url.go index eda3c2e1e4..e64d3f47b5 100644 --- a/flyteadmin/pkg/data/implementations/gcp_remote_url.go +++ b/flyteadmin/pkg/data/implementations/gcp_remote_url.go @@ -10,10 +10,10 @@ import ( credentials "cloud.google.com/go/iam/credentials/apiv1" gcs "cloud.google.com/go/storage" - "github.com/flyteorg/flyteadmin/pkg/data/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/ptypes/timestamp" "google.golang.org/api/option" credentialspb "google.golang.org/genproto/googleapis/iam/credentials/v1" diff --git a/flyteadmin/pkg/data/implementations/noop_remote_url.go b/flyteadmin/pkg/data/implementations/noop_remote_url.go index 5510ea7076..8dab8615fe 100644 --- a/flyteadmin/pkg/data/implementations/noop_remote_url.go +++ b/flyteadmin/pkg/data/implementations/noop_remote_url.go @@ -3,10 +3,10 @@ package implementations import ( "context" - "github.com/flyteorg/flyteadmin/pkg/data/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/storage" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/data/implementations/noop_remote_url_test.go b/flyteadmin/pkg/data/implementations/noop_remote_url_test.go index 097aeab1ab..3a44f2e08b 100644 --- a/flyteadmin/pkg/data/implementations/noop_remote_url_test.go +++ b/flyteadmin/pkg/data/implementations/noop_remote_url_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" ) const noopFileSize = int64(1256) diff --git a/flyteadmin/pkg/data/mocks/remote.go b/flyteadmin/pkg/data/mocks/remote.go index 34a5687372..a00b95d521 100644 --- a/flyteadmin/pkg/data/mocks/remote.go +++ b/flyteadmin/pkg/data/mocks/remote.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/errors/errors.go b/flyteadmin/pkg/errors/errors.go index bb14fbaf53..6a6e60f006 100644 --- a/flyteadmin/pkg/errors/errors.go +++ b/flyteadmin/pkg/errors/errors.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/pkg/executioncluster/execution_target.go b/flyteadmin/pkg/executioncluster/execution_target.go index d6acb87ace..7f80a22d1c 100644 --- a/flyteadmin/pkg/executioncluster/execution_target.go +++ b/flyteadmin/pkg/executioncluster/execution_target.go @@ -1,8 +1,8 @@ package executioncluster import ( - flyteclient "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" - "github.com/flyteorg/flytestdlib/random" + flyteclient "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" + "github.com/flyteorg/flyte/flytestdlib/random" "k8s.io/client-go/dynamic" restclient "k8s.io/client-go/rest" diff --git a/flyteadmin/pkg/executioncluster/impl/cluster_execution_target_provider.go b/flyteadmin/pkg/executioncluster/impl/cluster_execution_target_provider.go index ad6e95bb93..9533e55942 100644 --- a/flyteadmin/pkg/executioncluster/impl/cluster_execution_target_provider.go +++ b/flyteadmin/pkg/executioncluster/impl/cluster_execution_target_provider.go @@ -1,11 +1,11 @@ package impl import ( - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - "github.com/flyteorg/flyteadmin/pkg/flytek8s" - runtime "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - flyteclient "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/flytek8s" + runtime "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + flyteclient "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" "github.com/prometheus/client_golang/prometheus" "k8s.io/client-go/dynamic" "k8s.io/client-go/rest" diff --git a/flyteadmin/pkg/executioncluster/impl/factory.go b/flyteadmin/pkg/executioncluster/impl/factory.go index ae8940aa96..eb351eff05 100644 --- a/flyteadmin/pkg/executioncluster/impl/factory.go +++ b/flyteadmin/pkg/executioncluster/impl/factory.go @@ -1,10 +1,10 @@ package impl import ( - executioncluster_interface "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + executioncluster_interface "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) func GetExecutionCluster(scope promutils.Scope, kubeConfig, master string, config interfaces.Configuration, db repositoryInterfaces.Repository) executioncluster_interface.ClusterInterface { diff --git a/flyteadmin/pkg/executioncluster/impl/in_cluster.go b/flyteadmin/pkg/executioncluster/impl/in_cluster.go index 60678b9900..ac10933a64 100644 --- a/flyteadmin/pkg/executioncluster/impl/in_cluster.go +++ b/flyteadmin/pkg/executioncluster/impl/in_cluster.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - "github.com/flyteorg/flyteadmin/pkg/flytek8s" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/flytek8s" "github.com/pkg/errors" "k8s.io/client-go/dynamic" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/flyteadmin/pkg/executioncluster/impl/in_cluster_test.go b/flyteadmin/pkg/executioncluster/impl/in_cluster_test.go index c5a8e7ee8f..5525bcf13e 100644 --- a/flyteadmin/pkg/executioncluster/impl/in_cluster_test.go +++ b/flyteadmin/pkg/executioncluster/impl/in_cluster_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/executioncluster/impl/list_targets.go b/flyteadmin/pkg/executioncluster/impl/list_targets.go index 1ffd23ebbb..27b1c808ec 100644 --- a/flyteadmin/pkg/executioncluster/impl/list_targets.go +++ b/flyteadmin/pkg/executioncluster/impl/list_targets.go @@ -5,9 +5,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - runtime "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + runtime "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type listTargets struct { diff --git a/flyteadmin/pkg/executioncluster/impl/list_targets_test.go b/flyteadmin/pkg/executioncluster/impl/list_targets_test.go index 089113c902..3ee7316fa1 100644 --- a/flyteadmin/pkg/executioncluster/impl/list_targets_test.go +++ b/flyteadmin/pkg/executioncluster/impl/list_targets_test.go @@ -3,10 +3,10 @@ package impl import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/mocks" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/pkg/executioncluster/impl/random_cluster_selector.go b/flyteadmin/pkg/executioncluster/impl/random_cluster_selector.go index 10bdd77145..42624f8920 100644 --- a/flyteadmin/pkg/executioncluster/impl/random_cluster_selector.go +++ b/flyteadmin/pkg/executioncluster/impl/random_cluster_selector.go @@ -6,23 +6,23 @@ import ( "hash/fnv" "math/rand" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/resources" - managerInterfaces "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/resources" + managerInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" - "github.com/flyteorg/flytestdlib/random" + "github.com/flyteorg/flyte/flytestdlib/random" - runtime "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtime "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) // Implementation of Random cluster selector diff --git a/flyteadmin/pkg/executioncluster/impl/random_cluster_selector_test.go b/flyteadmin/pkg/executioncluster/impl/random_cluster_selector_test.go index e30a92f323..954e09f01b 100644 --- a/flyteadmin/pkg/executioncluster/impl/random_cluster_selector_test.go +++ b/flyteadmin/pkg/executioncluster/impl/random_cluster_selector_test.go @@ -6,20 +6,20 @@ import ( "path/filepath" "testing" - "github.com/flyteorg/flyteadmin/pkg/errors" - repo_interface "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repo_mock "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + repo_interface "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repo_mock "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - interfaces2 "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - "github.com/flyteorg/flyteadmin/pkg/executioncluster/mocks" - "github.com/flyteorg/flyteadmin/pkg/runtime" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + interfaces2 "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/executioncluster/interfaces/cluster.go b/flyteadmin/pkg/executioncluster/interfaces/cluster.go index 77c0341a6c..f5057f9569 100644 --- a/flyteadmin/pkg/executioncluster/interfaces/cluster.go +++ b/flyteadmin/pkg/executioncluster/interfaces/cluster.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" ) type GetTargetInterface interface { diff --git a/flyteadmin/pkg/executioncluster/interfaces/execution_target_provider.go b/flyteadmin/pkg/executioncluster/interfaces/execution_target_provider.go index fd92833b47..34b770fca8 100644 --- a/flyteadmin/pkg/executioncluster/interfaces/execution_target_provider.go +++ b/flyteadmin/pkg/executioncluster/interfaces/execution_target_provider.go @@ -1,8 +1,8 @@ package interfaces import ( - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteadmin/pkg/executioncluster/mocks/cluster_interface.go b/flyteadmin/pkg/executioncluster/mocks/cluster_interface.go index ef17bf1047..de4548a53a 100644 --- a/flyteadmin/pkg/executioncluster/mocks/cluster_interface.go +++ b/flyteadmin/pkg/executioncluster/mocks/cluster_interface.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - executioncluster "github.com/flyteorg/flyteadmin/pkg/executioncluster" + executioncluster "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/pkg/executioncluster/mocks/execution_target_provider.go b/flyteadmin/pkg/executioncluster/mocks/execution_target_provider.go index 3fbf60f40d..248bccc62e 100644 --- a/flyteadmin/pkg/executioncluster/mocks/execution_target_provider.go +++ b/flyteadmin/pkg/executioncluster/mocks/execution_target_provider.go @@ -3,9 +3,9 @@ package mocks import ( - executioncluster "github.com/flyteorg/flyteadmin/pkg/executioncluster" + executioncluster "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" - interfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" mock "github.com/stretchr/testify/mock" diff --git a/flyteadmin/pkg/executioncluster/mocks/get_target_interface.go b/flyteadmin/pkg/executioncluster/mocks/get_target_interface.go index 03007fef88..58fd4ccf4e 100644 --- a/flyteadmin/pkg/executioncluster/mocks/get_target_interface.go +++ b/flyteadmin/pkg/executioncluster/mocks/get_target_interface.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - executioncluster "github.com/flyteorg/flyteadmin/pkg/executioncluster" + executioncluster "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/pkg/executioncluster/mocks/list_targets_interface.go b/flyteadmin/pkg/executioncluster/mocks/list_targets_interface.go index 38c9c77fc0..0da1b96650 100644 --- a/flyteadmin/pkg/executioncluster/mocks/list_targets_interface.go +++ b/flyteadmin/pkg/executioncluster/mocks/list_targets_interface.go @@ -3,7 +3,7 @@ package mocks import ( - executioncluster "github.com/flyteorg/flyteadmin/pkg/executioncluster" + executioncluster "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/pkg/executioncluster/mocks/mock_cluster.go b/flyteadmin/pkg/executioncluster/mocks/mock_cluster.go index f315c90943..f45ecb0274 100644 --- a/flyteadmin/pkg/executioncluster/mocks/mock_cluster.go +++ b/flyteadmin/pkg/executioncluster/mocks/mock_cluster.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" ) type GetTargetFunc func(context.Context, *executioncluster.ExecutionTargetSpec) (*executioncluster.ExecutionTarget, error) diff --git a/flyteadmin/pkg/flytek8s/client.go b/flyteadmin/pkg/flytek8s/client.go index a5baabb08a..e4d098ba3a 100644 --- a/flyteadmin/pkg/flytek8s/client.go +++ b/flyteadmin/pkg/flytek8s/client.go @@ -5,12 +5,12 @@ import ( "context" "os" - "github.com/flyteorg/flyteadmin/pkg/config" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/logger" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // to overcome gke auth provider issue restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" diff --git a/flyteadmin/pkg/manager/impl/description_entity_manager.go b/flyteadmin/pkg/manager/impl/description_entity_manager.go index 91e5398068..26f25575b6 100644 --- a/flyteadmin/pkg/manager/impl/description_entity_manager.go +++ b/flyteadmin/pkg/manager/impl/description_entity_manager.go @@ -4,22 +4,22 @@ import ( "context" "strconv" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "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/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type DescriptionEntityMetrics struct { diff --git a/flyteadmin/pkg/manager/impl/description_entity_manager_test.go b/flyteadmin/pkg/manager/impl/description_entity_manager_test.go index 66cdcc4a95..ebf7bd175e 100644 --- a/flyteadmin/pkg/manager/impl/description_entity_manager_test.go +++ b/flyteadmin/pkg/manager/impl/description_entity_manager_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/execution_manager.go b/flyteadmin/pkg/manager/impl/execution_manager.go index bd57d4fb14..c3c3fb0b5a 100644 --- a/flyteadmin/pkg/manager/impl/execution_manager.go +++ b/flyteadmin/pkg/manager/impl/execution_manager.go @@ -7,40 +7,40 @@ import ( "time" "github.com/benbjohnson/clock" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "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" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "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/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/auth" - cloudeventInterfaces "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/interfaces" - eventWriter "github.com/flyteorg/flyteadmin/pkg/async/events/interfaces" - "github.com/flyteorg/flyteadmin/pkg/async/notifications" - notificationInterfaces "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - dataInterfaces "github.com/flyteorg/flyteadmin/pkg/data/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/executions" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/resources" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/auth" + cloudeventInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent/interfaces" + eventWriter "github.com/flyteorg/flyte/flyteadmin/pkg/async/events/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications" + notificationInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + dataInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/executions" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/resources" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/plugins" ) const childContainerQueueKey = "child_queue" diff --git a/flyteadmin/pkg/manager/impl/execution_manager_test.go b/flyteadmin/pkg/manager/impl/execution_manager_test.go index 38bac0df10..c481c056b0 100644 --- a/flyteadmin/pkg/manager/impl/execution_manager_test.go +++ b/flyteadmin/pkg/manager/impl/execution_manager_test.go @@ -9,12 +9,12 @@ import ( "time" "github.com/benbjohnson/clock" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - mockScope "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/gogo/protobuf/jsonpb" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" @@ -27,30 +27,30 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteadmin/auth" - eventWriterMocks "github.com/flyteorg/flyteadmin/pkg/async/events/mocks" - notificationMocks "github.com/flyteorg/flyteadmin/pkg/async/notifications/mocks" - "github.com/flyteorg/flyteadmin/pkg/common" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - commonTestUtils "github.com/flyteorg/flyteadmin/pkg/common/testutils" - dataMocks "github.com/flyteorg/flyteadmin/pkg/data/mocks" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/executions" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - managerInterfaces "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - managerMocks "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - "github.com/flyteorg/flyteadmin/pkg/runtime" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeIFaceMocks "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces/mocks" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" - workflowengineMocks "github.com/flyteorg/flyteadmin/pkg/workflowengine/mocks" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/auth" + eventWriterMocks "github.com/flyteorg/flyte/flyteadmin/pkg/async/events/mocks" + notificationMocks "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + commonTestUtils "github.com/flyteorg/flyte/flyteadmin/pkg/common/testutils" + dataMocks "github.com/flyteorg/flyte/flyteadmin/pkg/data/mocks" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/executions" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + managerInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + managerMocks "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeIFaceMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces/mocks" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + workflowengineMocks "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/mocks" + "github.com/flyteorg/flyte/flyteadmin/plugins" ) var spec = testutils.GetExecutionRequest().Spec diff --git a/flyteadmin/pkg/manager/impl/executions/quality_of_service.go b/flyteadmin/pkg/manager/impl/executions/quality_of_service.go index 4906466126..a9af45eeea 100644 --- a/flyteadmin/pkg/manager/impl/executions/quality_of_service.go +++ b/flyteadmin/pkg/manager/impl/executions/quality_of_service.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/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/flytestdlib/logger" "github.com/golang/protobuf/ptypes" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/executions/quality_of_service_test.go b/flyteadmin/pkg/manager/impl/executions/quality_of_service_test.go index dc04d2218c..e78a5dd6fc 100644 --- a/flyteadmin/pkg/manager/impl/executions/quality_of_service_test.go +++ b/flyteadmin/pkg/manager/impl/executions/quality_of_service_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - managerMocks "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeIFaceMocks "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces/mocks" - "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + managerMocks "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeIFaceMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/ptypes" diff --git a/flyteadmin/pkg/manager/impl/executions/queues.go b/flyteadmin/pkg/manager/impl/executions/queues.go index b972549706..fa05d7698c 100644 --- a/flyteadmin/pkg/manager/impl/executions/queues.go +++ b/flyteadmin/pkg/manager/impl/executions/queues.go @@ -4,18 +4,18 @@ import ( "context" "math/rand" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/resources" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/resources" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type tag = string diff --git a/flyteadmin/pkg/manager/impl/executions/queues_test.go b/flyteadmin/pkg/manager/impl/executions/queues_test.go index 2dcc9f2f6d..4acb2f41c0 100644 --- a/flyteadmin/pkg/manager/impl/executions/queues_test.go +++ b/flyteadmin/pkg/manager/impl/executions/queues_test.go @@ -4,19 +4,19 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/launch_plan_manager.go b/flyteadmin/pkg/manager/impl/launch_plan_manager.go index 5e1c3fb00d..9b5eae61ff 100644 --- a/flyteadmin/pkg/manager/impl/launch_plan_manager.go +++ b/flyteadmin/pkg/manager/impl/launch_plan_manager.go @@ -5,25 +5,25 @@ import ( "context" "strconv" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "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/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" - scheduleInterfaces "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + scheduleInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type launchPlanMetrics struct { diff --git a/flyteadmin/pkg/manager/impl/launch_plan_manager_test.go b/flyteadmin/pkg/manager/impl/launch_plan_manager_test.go index 61b5db80bb..e0df95c772 100644 --- a/flyteadmin/pkg/manager/impl/launch_plan_manager_test.go +++ b/flyteadmin/pkg/manager/impl/launch_plan_manager_test.go @@ -9,26 +9,26 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/mocks" - scheduleInterfaces "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" + scheduleInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" "github.com/golang/protobuf/ptypes" - "github.com/flyteorg/flyteadmin/pkg/common" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" "github.com/golang/protobuf/proto" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/metrics_manager.go b/flyteadmin/pkg/manager/impl/metrics_manager.go index 27f3684069..3297bff871 100644 --- a/flyteadmin/pkg/manager/impl/metrics_manager.go +++ b/flyteadmin/pkg/manager/impl/metrics_manager.go @@ -7,14 +7,14 @@ import ( "sort" "time" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/ptypes/duration" "github.com/golang/protobuf/ptypes/timestamp" diff --git a/flyteadmin/pkg/manager/impl/metrics_manager_test.go b/flyteadmin/pkg/manager/impl/metrics_manager_test.go index 2958285b8b..1a529394c9 100644 --- a/flyteadmin/pkg/manager/impl/metrics_manager_test.go +++ b/flyteadmin/pkg/manager/impl/metrics_manager_test.go @@ -8,8 +8,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/golang/protobuf/ptypes/duration" "github.com/golang/protobuf/ptypes/timestamp" diff --git a/flyteadmin/pkg/manager/impl/named_entity_manager.go b/flyteadmin/pkg/manager/impl/named_entity_manager.go index 9c29910b06..478c59fc3e 100644 --- a/flyteadmin/pkg/manager/impl/named_entity_manager.go +++ b/flyteadmin/pkg/manager/impl/named_entity_manager.go @@ -5,22 +5,22 @@ import ( "strconv" "strings" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "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/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) const state = "state" diff --git a/flyteadmin/pkg/manager/impl/named_entity_manager_test.go b/flyteadmin/pkg/manager/impl/named_entity_manager_test.go index f5105fec17..ea76ecf304 100644 --- a/flyteadmin/pkg/manager/impl/named_entity_manager_test.go +++ b/flyteadmin/pkg/manager/impl/named_entity_manager_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/node_execution_manager.go b/flyteadmin/pkg/manager/impl/node_execution_manager.go index 50e33b7c62..701a1ce46a 100644 --- a/flyteadmin/pkg/manager/impl/node_execution_manager.go +++ b/flyteadmin/pkg/manager/impl/node_execution_manager.go @@ -5,31 +5,31 @@ import ( "fmt" "strconv" + "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" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "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/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" - cloudeventInterfaces "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/interfaces" - eventWriter "github.com/flyteorg/flyteadmin/pkg/async/events/interfaces" - notificationInterfaces "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - dataInterfaces "github.com/flyteorg/flyteadmin/pkg/data/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + cloudeventInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent/interfaces" + eventWriter "github.com/flyteorg/flyte/flyteadmin/pkg/async/events/interfaces" + notificationInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + dataInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type nodeExecutionMetrics struct { diff --git a/flyteadmin/pkg/manager/impl/node_execution_manager_test.go b/flyteadmin/pkg/manager/impl/node_execution_manager_test.go index 9f326070c0..80504cf9a2 100644 --- a/flyteadmin/pkg/manager/impl/node_execution_manager_test.go +++ b/flyteadmin/pkg/manager/impl/node_execution_manager_test.go @@ -7,34 +7,34 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" - genModel "github.com/flyteorg/flyteadmin/pkg/repositories/gen/models" + genModel "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/gen/models" - eventWriterMocks "github.com/flyteorg/flyteadmin/pkg/async/events/mocks" + eventWriterMocks "github.com/flyteorg/flyte/flyteadmin/pkg/async/events/mocks" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + mockScope "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/flyteidl/gen/pb-go/flyteidl/event" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/common" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - dataMocks "github.com/flyteorg/flyteadmin/pkg/data/mocks" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + dataMocks "github.com/flyteorg/flyte/flyteadmin/pkg/data/mocks" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) var occurredAt = time.Now().UTC() diff --git a/flyteadmin/pkg/manager/impl/project_manager.go b/flyteadmin/pkg/manager/impl/project_manager.go index 3c4b2d3ac1..ed2a4b2c37 100644 --- a/flyteadmin/pkg/manager/impl/project_manager.go +++ b/flyteadmin/pkg/manager/impl/project_manager.go @@ -7,15 +7,15 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type ProjectManager struct { diff --git a/flyteadmin/pkg/manager/impl/project_manager_test.go b/flyteadmin/pkg/manager/impl/project_manager_test.go index 5b2b437c04..a6c0571c5e 100644 --- a/flyteadmin/pkg/manager/impl/project_manager_test.go +++ b/flyteadmin/pkg/manager/impl/project_manager_test.go @@ -7,14 +7,14 @@ import ( "github.com/golang/protobuf/proto" - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/resources/resource_manager.go b/flyteadmin/pkg/manager/impl/resources/resource_manager.go index d656589910..cfa5369038 100644 --- a/flyteadmin/pkg/manager/impl/resources/resource_manager.go +++ b/flyteadmin/pkg/manager/impl/resources/resource_manager.go @@ -3,25 +3,25 @@ package resources import ( "context" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "github.com/gogo/protobuf/proto" "google.golang.org/grpc/codes" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - repo_interface "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + repo_interface "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type ResourceManager struct { diff --git a/flyteadmin/pkg/manager/impl/resources/resource_manager_test.go b/flyteadmin/pkg/manager/impl/resources/resource_manager_test.go index 8c587937cf..00b7abaa93 100644 --- a/flyteadmin/pkg/manager/impl/resources/resource_manager_test.go +++ b/flyteadmin/pkg/manager/impl/resources/resource_manager_test.go @@ -3,24 +3,24 @@ package resources import ( "context" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" // pkg/runtime/interfaces/application_configuration.go "testing" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - commonTestUtils "github.com/flyteorg/flyteadmin/pkg/common/testutils" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + commonTestUtils "github.com/flyteorg/flyte/flyteadmin/pkg/common/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/manager/impl/shared/errors.go b/flyteadmin/pkg/manager/impl/shared/errors.go index 63cc99594b..720a1db8d9 100644 --- a/flyteadmin/pkg/manager/impl/shared/errors.go +++ b/flyteadmin/pkg/manager/impl/shared/errors.go @@ -4,7 +4,7 @@ package shared import ( "fmt" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/signal_manager.go b/flyteadmin/pkg/manager/impl/signal_manager.go index ff7004faef..092c8ee0e1 100644 --- a/flyteadmin/pkg/manager/impl/signal_manager.go +++ b/flyteadmin/pkg/manager/impl/signal_manager.go @@ -4,22 +4,22 @@ import ( "context" "strconv" + "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/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" ) type signalMetrics struct { diff --git a/flyteadmin/pkg/manager/impl/signal_manager_test.go b/flyteadmin/pkg/manager/impl/signal_manager_test.go index cc01f07fe3..6e1dcac0d8 100644 --- a/flyteadmin/pkg/manager/impl/signal_manager_test.go +++ b/flyteadmin/pkg/manager/impl/signal_manager_test.go @@ -5,14 +5,14 @@ import ( "errors" "testing" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/manager/impl/task_execution_manager.go b/flyteadmin/pkg/manager/impl/task_execution_manager.go index ab0107f77c..f23d41229d 100644 --- a/flyteadmin/pkg/manager/impl/task_execution_manager.go +++ b/flyteadmin/pkg/manager/impl/task_execution_manager.go @@ -5,29 +5,29 @@ import ( "fmt" "strconv" + "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" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "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/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" - cloudeventInterfaces "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/interfaces" - notificationInterfaces "github.com/flyteorg/flyteadmin/pkg/async/notifications/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - dataInterfaces "github.com/flyteorg/flyteadmin/pkg/data/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + cloudeventInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent/interfaces" + notificationInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + dataInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type taskExecutionMetrics struct { diff --git a/flyteadmin/pkg/manager/impl/task_execution_manager_test.go b/flyteadmin/pkg/manager/impl/task_execution_manager_test.go index 4c190d0bff..506d5b6ef0 100644 --- a/flyteadmin/pkg/manager/impl/task_execution_manager_test.go +++ b/flyteadmin/pkg/manager/impl/task_execution_manager_test.go @@ -7,21 +7,21 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flytestdlib/storage" - - "github.com/flyteorg/flyteadmin/pkg/common" - - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - dataMocks "github.com/flyteorg/flyteadmin/pkg/data/mocks" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flytestdlib/storage" + + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + dataMocks "github.com/flyteorg/flyte/flyteadmin/pkg/data/mocks" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + mockScope "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/flyteidl/gen/pb-go/flyteidl/event" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/manager/impl/task_manager.go b/flyteadmin/pkg/manager/impl/task_manager.go index ba02f5c4b1..3e8404dc81 100644 --- a/flyteadmin/pkg/manager/impl/task_manager.go +++ b/flyteadmin/pkg/manager/impl/task_manager.go @@ -6,27 +6,27 @@ import ( "strconv" "time" + "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/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "github.com/golang/protobuf/ptypes" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/resources" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - workflowengine "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/resources" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + workflowengine "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" ) type taskMetrics struct { diff --git a/flyteadmin/pkg/manager/impl/task_manager_test.go b/flyteadmin/pkg/manager/impl/task_manager_test.go index 8b8a38e761..b4f165755c 100644 --- a/flyteadmin/pkg/manager/impl/task_manager_test.go +++ b/flyteadmin/pkg/manager/impl/task_manager_test.go @@ -6,22 +6,22 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteadmin/pkg/common" - adminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/golang/protobuf/proto" - workflowengine "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" - workflowMocks "github.com/flyteorg/flyteadmin/pkg/workflowengine/mocks" + workflowengine "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + workflowMocks "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/mocks" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/testutils/config.go b/flyteadmin/pkg/manager/impl/testutils/config.go index c2fe20139d..7685cb3a3b 100644 --- a/flyteadmin/pkg/manager/impl/testutils/config.go +++ b/flyteadmin/pkg/manager/impl/testutils/config.go @@ -1,9 +1,9 @@ package testutils import ( - "github.com/flyteorg/flyteadmin/pkg/common" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" ) func GetApplicationConfigWithDefaultDomains() runtimeInterfaces.ApplicationConfiguration { diff --git a/flyteadmin/pkg/manager/impl/testutils/repository.go b/flyteadmin/pkg/manager/impl/testutils/repository.go index 2bbfd0594d..d85c920c7e 100644 --- a/flyteadmin/pkg/manager/impl/testutils/repository.go +++ b/flyteadmin/pkg/manager/impl/testutils/repository.go @@ -3,12 +3,12 @@ package testutils import ( "context" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" ) func GetRepoWithDefaultProjectAndErr(err error) repositoryInterfaces.Repository { diff --git a/flyteadmin/pkg/manager/impl/util/data.go b/flyteadmin/pkg/manager/impl/util/data.go index cd281b81e6..896616f60d 100644 --- a/flyteadmin/pkg/manager/impl/util/data.go +++ b/flyteadmin/pkg/manager/impl/util/data.go @@ -3,13 +3,13 @@ package util import ( "context" - "github.com/flyteorg/flyteadmin/pkg/common" - dataInterfaces "github.com/flyteorg/flyteadmin/pkg/data/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + dataInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/manager/impl/util/data_test.go b/flyteadmin/pkg/manager/impl/util/data_test.go index 69f41567fa..13d4c24907 100644 --- a/flyteadmin/pkg/manager/impl/util/data_test.go +++ b/flyteadmin/pkg/manager/impl/util/data_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - urlMocks "github.com/flyteorg/flyteadmin/pkg/data/mocks" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + urlMocks "github.com/flyteorg/flyte/flyteadmin/pkg/data/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/util/digests.go b/flyteadmin/pkg/manager/impl/util/digests.go index fccd040b3a..463f263914 100644 --- a/flyteadmin/pkg/manager/impl/util/digests.go +++ b/flyteadmin/pkg/manager/impl/util/digests.go @@ -3,11 +3,11 @@ package util import ( "context" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/pbhash" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/pbhash" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/util/filters.go b/flyteadmin/pkg/manager/impl/util/filters.go index e5e3daa0a4..8317886698 100644 --- a/flyteadmin/pkg/manager/impl/util/filters.go +++ b/flyteadmin/pkg/manager/impl/util/filters.go @@ -9,15 +9,15 @@ import ( "strings" "time" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" "google.golang.org/grpc/codes" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) const ( diff --git a/flyteadmin/pkg/manager/impl/util/filters_test.go b/flyteadmin/pkg/manager/impl/util/filters_test.go index 669788546d..450096f2a3 100644 --- a/flyteadmin/pkg/manager/impl/util/filters_test.go +++ b/flyteadmin/pkg/manager/impl/util/filters_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" ) func TestParseRepeatedValues(t *testing.T) { diff --git a/flyteadmin/pkg/manager/impl/util/resources.go b/flyteadmin/pkg/manager/impl/util/resources.go index f096957231..734127190c 100644 --- a/flyteadmin/pkg/manager/impl/util/resources.go +++ b/flyteadmin/pkg/manager/impl/util/resources.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/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/flytestdlib/logger" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/flyteadmin/pkg/manager/impl/util/resources_test.go b/flyteadmin/pkg/manager/impl/util/resources_test.go index f4180c4b52..ea152ba2bb 100644 --- a/flyteadmin/pkg/manager/impl/util/resources_test.go +++ b/flyteadmin/pkg/manager/impl/util/resources_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - managerInterfaces "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - managerMocks "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + managerInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + managerMocks "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteadmin/pkg/manager/impl/util/shared.go b/flyteadmin/pkg/manager/impl/util/shared.go index d9c61b121a..59847023b6 100644 --- a/flyteadmin/pkg/manager/impl/util/shared.go +++ b/flyteadmin/pkg/manager/impl/util/shared.go @@ -5,18 +5,18 @@ import ( "context" "time" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/util/shared_test.go b/flyteadmin/pkg/manager/impl/util/shared_test.go index e77607af68..a7d5d4cda7 100644 --- a/flyteadmin/pkg/manager/impl/util/shared_test.go +++ b/flyteadmin/pkg/manager/impl/util/shared_test.go @@ -9,18 +9,18 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" - "github.com/flyteorg/flyteadmin/pkg/common" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - managerInterfaces "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - managerMocks "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + managerInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + managerMocks "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/manager/impl/util/single_task_execution.go b/flyteadmin/pkg/manager/impl/util/single_task_execution.go index d23f38c98e..1245cc32c5 100644 --- a/flyteadmin/pkg/manager/impl/util/single_task_execution.go +++ b/flyteadmin/pkg/manager/impl/util/single_task_execution.go @@ -6,16 +6,16 @@ import ( "strings" "unicode" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + 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/flytestdlib/logger" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/util/single_task_execution_test.go b/flyteadmin/pkg/manager/impl/util/single_task_execution_test.go index 25b1c59f43..f800ac8c1d 100644 --- a/flyteadmin/pkg/manager/impl/util/single_task_execution_test.go +++ b/flyteadmin/pkg/manager/impl/util/single_task_execution_test.go @@ -5,21 +5,21 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" - managerMocks "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + managerMocks "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" ) func TestGenerateNodeNameFromTask(t *testing.T) { diff --git a/flyteadmin/pkg/manager/impl/validation/attributes_validator.go b/flyteadmin/pkg/manager/impl/validation/attributes_validator.go index 9a123acd82..0129fa06de 100644 --- a/flyteadmin/pkg/manager/impl/validation/attributes_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/attributes_validator.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/validation/attributes_validator_test.go b/flyteadmin/pkg/manager/impl/validation/attributes_validator_test.go index fc87ccb060..40cfb8ddbc 100644 --- a/flyteadmin/pkg/manager/impl/validation/attributes_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/attributes_validator_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/manager/impl/validation/execution_validator.go b/flyteadmin/pkg/manager/impl/validation/execution_validator.go index 73c31e1cc6..bf0f4bc5c3 100644 --- a/flyteadmin/pkg/manager/impl/validation/execution_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/execution_validator.go @@ -5,14 +5,14 @@ import ( "regexp" "strings" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/validators" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/validation/execution_validator_test.go b/flyteadmin/pkg/manager/impl/validation/execution_validator_test.go index 3aac994515..68244ece35 100644 --- a/flyteadmin/pkg/manager/impl/validation/execution_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/execution_validator_test.go @@ -9,7 +9,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/manager/impl/validation/launch_plan_validator.go b/flyteadmin/pkg/manager/impl/validation/launch_plan_validator.go index 254ed6863d..a124dc4c4b 100644 --- a/flyteadmin/pkg/manager/impl/validation/launch_plan_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/launch_plan_validator.go @@ -3,15 +3,15 @@ package validation import ( "context" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/validators" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/validation/launch_plan_validator_test.go b/flyteadmin/pkg/manager/impl/validation/launch_plan_validator_test.go index d24fbf81a6..71f41fe0ef 100644 --- a/flyteadmin/pkg/manager/impl/validation/launch_plan_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/launch_plan_validator_test.go @@ -8,7 +8,7 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/validation/named_entity_validator.go b/flyteadmin/pkg/manager/impl/validation/named_entity_validator.go index a23d609bb3..abb1615eb1 100644 --- a/flyteadmin/pkg/manager/impl/validation/named_entity_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/named_entity_validator.go @@ -1,8 +1,8 @@ package validation import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/manager/impl/validation/named_entity_validator_test.go b/flyteadmin/pkg/manager/impl/validation/named_entity_validator_test.go index f69d6fa683..ba4b101839 100644 --- a/flyteadmin/pkg/manager/impl/validation/named_entity_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/named_entity_validator_test.go @@ -3,7 +3,7 @@ package validation import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" diff --git a/flyteadmin/pkg/manager/impl/validation/node_execution_validator.go b/flyteadmin/pkg/manager/impl/validation/node_execution_validator.go index da88543c16..0d517f0eb3 100644 --- a/flyteadmin/pkg/manager/impl/validation/node_execution_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/node_execution_validator.go @@ -1,8 +1,8 @@ package validation import ( - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteadmin/pkg/manager/impl/validation/notifications_validator.go b/flyteadmin/pkg/manager/impl/validation/notifications_validator.go index 5144e515ed..57049de33b 100644 --- a/flyteadmin/pkg/manager/impl/validation/notifications_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/notifications_validator.go @@ -1,8 +1,8 @@ package validation import ( - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/manager/impl/validation/project_validator.go b/flyteadmin/pkg/manager/impl/validation/project_validator.go index 03b427640a..88b83880d4 100644 --- a/flyteadmin/pkg/manager/impl/validation/project_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/project_validator.go @@ -3,12 +3,12 @@ package validation import ( "context" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" - "github.com/flyteorg/flyteadmin/pkg/errors" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/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" "google.golang.org/grpc/codes" "k8s.io/apimachinery/pkg/util/validation" diff --git a/flyteadmin/pkg/manager/impl/validation/project_validator_test.go b/flyteadmin/pkg/manager/impl/validation/project_validator_test.go index 521d25085a..b37bdea54a 100644 --- a/flyteadmin/pkg/manager/impl/validation/project_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/project_validator_test.go @@ -6,12 +6,12 @@ import ( "strconv" "testing" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/validation/shared_execution.go b/flyteadmin/pkg/manager/impl/validation/shared_execution.go index 8b5ea11ade..8c065f8677 100644 --- a/flyteadmin/pkg/manager/impl/validation/shared_execution.go +++ b/flyteadmin/pkg/manager/impl/validation/shared_execution.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" ) // ValidateClusterForExecutionID validates that the execution denoted by executionId is recorded as executing on `cluster`. diff --git a/flyteadmin/pkg/manager/impl/validation/shared_execution_test.go b/flyteadmin/pkg/manager/impl/validation/shared_execution_test.go index 187f6c9f99..b36393f4aa 100644 --- a/flyteadmin/pkg/manager/impl/validation/shared_execution_test.go +++ b/flyteadmin/pkg/manager/impl/validation/shared_execution_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/manager/impl/validation/signal_validator.go b/flyteadmin/pkg/manager/impl/validation/signal_validator.go index 11c5b335d7..c8ac7c07a3 100644 --- a/flyteadmin/pkg/manager/impl/validation/signal_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/signal_validator.go @@ -3,15 +3,15 @@ package validation import ( "context" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - propellervalidators "github.com/flyteorg/flytepropeller/pkg/compiler/validators" + propellervalidators "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/validation/signal_validator_test.go b/flyteadmin/pkg/manager/impl/validation/signal_validator_test.go index 331da688c5..5cef9737a1 100644 --- a/flyteadmin/pkg/manager/impl/validation/signal_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/signal_validator_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteadmin/pkg/manager/impl/validation/task_execution_validator.go b/flyteadmin/pkg/manager/impl/validation/task_execution_validator.go index 522febf97a..36d44b44de 100644 --- a/flyteadmin/pkg/manager/impl/validation/task_execution_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/task_execution_validator.go @@ -1,8 +1,8 @@ package validation import ( - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteadmin/pkg/manager/impl/validation/task_validator.go b/flyteadmin/pkg/manager/impl/validation/task_validator.go index f8d8f5ae11..f276c8e4d6 100644 --- a/flyteadmin/pkg/manager/impl/validation/task_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/task_validator.go @@ -5,18 +5,18 @@ import ( "context" "strings" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - runtime "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + runtime "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/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/flytestdlib/logger" corev1 "k8s.io/api/core/v1" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/manager/impl/validation/task_validator_test.go b/flyteadmin/pkg/manager/impl/validation/task_validator_test.go index 78ec0309ce..c6286dca61 100644 --- a/flyteadmin/pkg/manager/impl/validation/task_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/task_validator_test.go @@ -6,10 +6,10 @@ import ( "errors" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/manager/impl/validation/validation.go b/flyteadmin/pkg/manager/impl/validation/validation.go index e6c7cfae2f..871f270079 100644 --- a/flyteadmin/pkg/manager/impl/validation/validation.go +++ b/flyteadmin/pkg/manager/impl/validation/validation.go @@ -8,12 +8,12 @@ import ( "github.com/golang/protobuf/proto" "k8s.io/apimachinery/pkg/util/validation" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/validators" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/validation/validation_test.go b/flyteadmin/pkg/manager/impl/validation/validation_test.go index 80830ce033..5cc62a7430 100644 --- a/flyteadmin/pkg/manager/impl/validation/validation_test.go +++ b/flyteadmin/pkg/manager/impl/validation/validation_test.go @@ -9,9 +9,9 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/manager/impl/validation/workflow_validator.go b/flyteadmin/pkg/manager/impl/validation/workflow_validator.go index c47c444944..95da269412 100644 --- a/flyteadmin/pkg/manager/impl/validation/workflow_validator.go +++ b/flyteadmin/pkg/manager/impl/validation/workflow_validator.go @@ -3,18 +3,18 @@ package validation import ( "context" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" "github.com/golang/protobuf/proto" "k8s.io/apimachinery/pkg/api/resource" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" - runtime "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared" + runtime "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/flytestdlib/logger" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/impl/validation/workflow_validator_test.go b/flyteadmin/pkg/manager/impl/validation/workflow_validator_test.go index 7791ab09c2..99fb639765 100644 --- a/flyteadmin/pkg/manager/impl/validation/workflow_validator_test.go +++ b/flyteadmin/pkg/manager/impl/validation/workflow_validator_test.go @@ -5,12 +5,12 @@ import ( "errors" "testing" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/version_manager.go b/flyteadmin/pkg/manager/impl/version_manager.go index 425c222bcb..c13fd1e854 100644 --- a/flyteadmin/pkg/manager/impl/version_manager.go +++ b/flyteadmin/pkg/manager/impl/version_manager.go @@ -3,9 +3,9 @@ package impl import ( "context" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + adminversion "github.com/flyteorg/flyte/flytestdlib/version" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - adminversion "github.com/flyteorg/flytestdlib/version" ) type VersionManager struct { diff --git a/flyteadmin/pkg/manager/impl/version_manager_test.go b/flyteadmin/pkg/manager/impl/version_manager_test.go index 784655cf46..00ee576ce2 100644 --- a/flyteadmin/pkg/manager/impl/version_manager_test.go +++ b/flyteadmin/pkg/manager/impl/version_manager_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + adminversion "github.com/flyteorg/flyte/flytestdlib/version" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - adminversion "github.com/flyteorg/flytestdlib/version" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/manager/impl/workflow_manager.go b/flyteadmin/pkg/manager/impl/workflow_manager.go index 65996b5f3d..8c8dbadbf1 100644 --- a/flyteadmin/pkg/manager/impl/workflow_manager.go +++ b/flyteadmin/pkg/manager/impl/workflow_manager.go @@ -6,28 +6,28 @@ import ( "strconv" "time" + compiler "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - compiler "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/ptypes" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - workflowengine "github.com/flyteorg/flyteadmin/pkg/workflowengine/impl" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + workflowengine "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/impl" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" ) var defaultStorageOptions = storage.Options{} diff --git a/flyteadmin/pkg/manager/impl/workflow_manager_test.go b/flyteadmin/pkg/manager/impl/workflow_manager_test.go index cc30e8aafc..31c2dc7dd3 100644 --- a/flyteadmin/pkg/manager/impl/workflow_manager_test.go +++ b/flyteadmin/pkg/manager/impl/workflow_manager_test.go @@ -6,26 +6,26 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteadmin/pkg/common" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - adminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/golang/protobuf/proto" - flyteErrors "github.com/flyteorg/flyteadmin/pkg/errors" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" - workflowengineInterfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" - workflowengineMocks "github.com/flyteorg/flyteadmin/pkg/workflowengine/mocks" + flyteErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + workflowengineInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + workflowengineMocks "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + engine "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler" - engine "github.com/flyteorg/flytepropeller/pkg/compiler/common" - mockScope "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/manager/mocks/launch_plan.go b/flyteadmin/pkg/manager/mocks/launch_plan.go index dbd8b24873..34da7fcf2d 100644 --- a/flyteadmin/pkg/manager/mocks/launch_plan.go +++ b/flyteadmin/pkg/manager/mocks/launch_plan.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/manager/mocks/resource.go b/flyteadmin/pkg/manager/mocks/resource.go index 1339e10d7f..6025fbc55b 100644 --- a/flyteadmin/pkg/manager/mocks/resource.go +++ b/flyteadmin/pkg/manager/mocks/resource.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/repositories/config/migration_models.go b/flyteadmin/pkg/repositories/config/migration_models.go index cafcd253f6..e2f4b72db5 100644 --- a/flyteadmin/pkg/repositories/config/migration_models.go +++ b/flyteadmin/pkg/repositories/config/migration_models.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) /* diff --git a/flyteadmin/pkg/repositories/config/migrations.go b/flyteadmin/pkg/repositories/config/migrations.go index dab390a04a..5882d9bd38 100644 --- a/flyteadmin/pkg/repositories/config/migrations.go +++ b/flyteadmin/pkg/repositories/config/migrations.go @@ -5,12 +5,12 @@ import ( "fmt" "time" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - schedulerModels "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + schedulerModels "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/repositories/config/seed_data.go b/flyteadmin/pkg/repositories/config/seed_data.go index 773f47d832..d6ef3c89ba 100644 --- a/flyteadmin/pkg/repositories/config/seed_data.go +++ b/flyteadmin/pkg/repositories/config/seed_data.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/logger" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/repositories/database.go b/flyteadmin/pkg/repositories/database.go index fdc663ac68..3c95e5602c 100644 --- a/flyteadmin/pkg/repositories/database.go +++ b/flyteadmin/pkg/repositories/database.go @@ -8,11 +8,11 @@ import ( "os" "strings" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/flytestdlib/database" "gorm.io/driver/sqlite" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/jackc/pgconn" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/flyteadmin/pkg/repositories/database_integration_test.go b/flyteadmin/pkg/repositories/database_integration_test.go index 26bef38258..b7f96854dd 100644 --- a/flyteadmin/pkg/repositories/database_integration_test.go +++ b/flyteadmin/pkg/repositories/database_integration_test.go @@ -6,8 +6,8 @@ package repositories import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/config" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/repositories/database_test.go b/flyteadmin/pkg/repositories/database_test.go index 4dea5585ec..f1b0cc7499 100644 --- a/flyteadmin/pkg/repositories/database_test.go +++ b/flyteadmin/pkg/repositories/database_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/flytestdlib/database" "github.com/jackc/pgconn" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/stretchr/testify/assert" "gorm.io/driver/sqlite" diff --git a/flyteadmin/pkg/repositories/errors/error_transformer.go b/flyteadmin/pkg/repositories/errors/error_transformer.go index 2fe97ab86c..9e8bf171e4 100644 --- a/flyteadmin/pkg/repositories/errors/error_transformer.go +++ b/flyteadmin/pkg/repositories/errors/error_transformer.go @@ -1,7 +1,7 @@ package errors import ( - admin_errors "github.com/flyteorg/flyteadmin/pkg/errors" + admin_errors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" ) // Defines the basic error transformer interface that all database types must implement. diff --git a/flyteadmin/pkg/repositories/errors/errors.go b/flyteadmin/pkg/repositories/errors/errors.go index 072bcc2871..916471e08c 100644 --- a/flyteadmin/pkg/repositories/errors/errors.go +++ b/flyteadmin/pkg/repositories/errors/errors.go @@ -2,7 +2,7 @@ package errors import ( - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/repositories/errors/postgres.go b/flyteadmin/pkg/repositories/errors/postgres.go index e85becb660..4f82ebefc9 100644 --- a/flyteadmin/pkg/repositories/errors/postgres.go +++ b/flyteadmin/pkg/repositories/errors/postgres.go @@ -14,9 +14,9 @@ import ( "fmt" "reflect" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" "github.com/jackc/pgconn" diff --git a/flyteadmin/pkg/repositories/errors/postgres_test.go b/flyteadmin/pkg/repositories/errors/postgres_test.go index 8b23655339..ddb75750ce 100644 --- a/flyteadmin/pkg/repositories/errors/postgres_test.go +++ b/flyteadmin/pkg/repositories/errors/postgres_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/jackc/pgconn" "github.com/magiconair/properties/assert" diff --git a/flyteadmin/pkg/repositories/errors/test_error_transformer.go b/flyteadmin/pkg/repositories/errors/test_error_transformer.go index 3a56aa6e31..0f8027a62f 100644 --- a/flyteadmin/pkg/repositories/errors/test_error_transformer.go +++ b/flyteadmin/pkg/repositories/errors/test_error_transformer.go @@ -2,7 +2,7 @@ package errors import ( - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/repositories/gorm_repo.go b/flyteadmin/pkg/repositories/gorm_repo.go index 3d80de611f..f1b1929324 100644 --- a/flyteadmin/pkg/repositories/gorm_repo.go +++ b/flyteadmin/pkg/repositories/gorm_repo.go @@ -1,12 +1,12 @@ package repositories import ( - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/gormimpl" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - schedulerGormImpl "github.com/flyteorg/flyteadmin/scheduler/repositories/gormimpl" - schedulerInterfaces "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/gormimpl" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + schedulerGormImpl "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/gormimpl" + schedulerInterfaces "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/repositories/gormimpl/common.go b/flyteadmin/pkg/repositories/gormimpl/common.go index 8feb11908d..5b5885c212 100644 --- a/flyteadmin/pkg/repositories/gormimpl/common.go +++ b/flyteadmin/pkg/repositories/gormimpl/common.go @@ -6,10 +6,10 @@ import ( "google.golang.org/grpc/codes" "gorm.io/gorm" - "github.com/flyteorg/flyteadmin/pkg/common" - adminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" ) const Project = "project" diff --git a/flyteadmin/pkg/repositories/gormimpl/description_entity_repo.go b/flyteadmin/pkg/repositories/gormimpl/description_entity_repo.go index f698f905f2..204c884f06 100644 --- a/flyteadmin/pkg/repositories/gormimpl/description_entity_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/description_entity_repo.go @@ -3,14 +3,14 @@ package gormimpl import ( "context" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "gorm.io/gorm" - "github.com/flyteorg/flyteadmin/pkg/common" - flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + flyteAdminDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // DescriptionEntityRepo Implementation of DescriptionEntityRepoInterface. diff --git a/flyteadmin/pkg/repositories/gormimpl/description_entity_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/description_entity_repo_test.go index 9ae447417f..9bf43d79c4 100644 --- a/flyteadmin/pkg/repositories/gormimpl/description_entity_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/description_entity_repo_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" mocket "github.com/Selvatico/go-mocket" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - mockScope "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/repositories/gormimpl/execution_event_repo.go b/flyteadmin/pkg/repositories/gormimpl/execution_event_repo.go index 00cdd6290b..efa0d6a094 100644 --- a/flyteadmin/pkg/repositories/gormimpl/execution_event_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/execution_event_repo.go @@ -3,10 +3,10 @@ package gormimpl import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/repositories/gormimpl/execution_event_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/execution_event_repo_test.go index 9090616f9a..6d0fc813fd 100644 --- a/flyteadmin/pkg/repositories/gormimpl/execution_event_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/execution_event_repo_test.go @@ -7,10 +7,10 @@ import ( "time" mocket "github.com/Selvatico/go-mocket" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/repositories/gormimpl/execution_repo.go b/flyteadmin/pkg/repositories/gormimpl/execution_repo.go index a7979922e9..2f9013e729 100644 --- a/flyteadmin/pkg/repositories/gormimpl/execution_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/execution_repo.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flyteadmin/pkg/common" - adminErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/repositories/gormimpl/execution_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/execution_repo_test.go index a89c079adc..73b2fccce5 100644 --- a/flyteadmin/pkg/repositories/gormimpl/execution_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/execution_repo_test.go @@ -7,16 +7,16 @@ import ( "time" mocket "github.com/Selvatico/go-mocket" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) var createdAt = time.Date(2018, time.February, 17, 00, 00, 00, 00, time.UTC).UTC() diff --git a/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo.go b/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo.go index d72eb6f8b8..8c2160e0a5 100644 --- a/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo.go @@ -5,15 +5,15 @@ import ( "errors" "time" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "gorm.io/gorm" - adminErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) const launchPlanTableName = "launch_plans" diff --git a/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo_test.go index 39d557d5f0..9890dee0b3 100644 --- a/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/launch_plan_repo_test.go @@ -6,14 +6,14 @@ import ( "testing" mocket "github.com/Selvatico/go-mocket" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) const workflowID = uint(1) diff --git a/flyteadmin/pkg/repositories/gormimpl/metrics.go b/flyteadmin/pkg/repositories/gormimpl/metrics.go index ae4a6a7d65..48683540b9 100644 --- a/flyteadmin/pkg/repositories/gormimpl/metrics.go +++ b/flyteadmin/pkg/repositories/gormimpl/metrics.go @@ -3,7 +3,7 @@ package gormimpl import ( "time" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) // Common metrics emitted by gormimpl repos. diff --git a/flyteadmin/pkg/repositories/gormimpl/named_entity_repo.go b/flyteadmin/pkg/repositories/gormimpl/named_entity_repo.go index 66a9f8188e..6148f4a2e1 100644 --- a/flyteadmin/pkg/repositories/gormimpl/named_entity_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/named_entity_repo.go @@ -4,16 +4,16 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "google.golang.org/grpc/codes" "gorm.io/gorm" - "github.com/flyteorg/flyteadmin/pkg/common" - adminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) const innerJoinTableAlias = "entities" diff --git a/flyteadmin/pkg/repositories/gormimpl/named_entity_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/named_entity_repo_test.go index 39fb861824..c1d4e883b4 100644 --- a/flyteadmin/pkg/repositories/gormimpl/named_entity_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/named_entity_repo_test.go @@ -4,17 +4,17 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" mocket "github.com/Selvatico/go-mocket" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) func getMockNamedEntityResponseFromDb(expected models.NamedEntity) map[string]interface{} { diff --git a/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo.go b/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo.go index cedf8242e1..b3c7b1cac2 100644 --- a/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo.go @@ -3,12 +3,12 @@ package gormimpl import ( "context" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type NodeExecutionEventRepo struct { diff --git a/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo_test.go index 4255c57c42..f9d50fa593 100644 --- a/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/node_execution_event_repo_test.go @@ -5,9 +5,9 @@ import ( "testing" mocket "github.com/Selvatico/go-mocket" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - mockScope "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go index 71b6de4814..0e34ac66df 100644 --- a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "gorm.io/gorm" - adminErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Implementation of NodeExecutionInterface. diff --git a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo_test.go index b646a1d4b7..a00135e971 100644 --- a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo_test.go @@ -6,19 +6,19 @@ import ( "time" mocket "github.com/Selvatico/go-mocket" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "gorm.io/gorm" - "github.com/flyteorg/flyteadmin/pkg/common" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) var nodePhase = core.NodeExecution_RUNNING.String() diff --git a/flyteadmin/pkg/repositories/gormimpl/project_repo.go b/flyteadmin/pkg/repositories/gormimpl/project_repo.go index c9ee44413c..bb6e360256 100644 --- a/flyteadmin/pkg/repositories/gormimpl/project_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/project_repo.go @@ -4,15 +4,15 @@ import ( "context" "errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "google.golang.org/grpc/codes" "gorm.io/gorm" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + flyteAdminDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type ProjectRepo struct { diff --git a/flyteadmin/pkg/repositories/gormimpl/project_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/project_repo_test.go index 019cd22b69..42a94b0c22 100644 --- a/flyteadmin/pkg/repositories/gormimpl/project_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/project_repo_test.go @@ -5,14 +5,14 @@ import ( "testing" mocket "github.com/Selvatico/go-mocket" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) var alphabeticalSortParam, _ = common.NewSortParameter(&admin.Sort{ diff --git a/flyteadmin/pkg/repositories/gormimpl/resource_repo.go b/flyteadmin/pkg/repositories/gormimpl/resource_repo.go index 1f94abce5c..533b079d1c 100644 --- a/flyteadmin/pkg/repositories/gormimpl/resource_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/resource_repo.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" - flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + flyteAdminDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "google.golang.org/grpc/codes" "gorm.io/gorm" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" ) type ResourceRepo struct { diff --git a/flyteadmin/pkg/repositories/gormimpl/resource_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/resource_repo_test.go index 375eb74162..ccdce6b701 100644 --- a/flyteadmin/pkg/repositories/gormimpl/resource_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/resource_repo_test.go @@ -5,13 +5,13 @@ import ( "testing" mocket "github.com/Selvatico/go-mocket" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" "gorm.io/gorm" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) const resourceTestWorkflowName = "workflow" diff --git a/flyteadmin/pkg/repositories/gormimpl/signal_repo.go b/flyteadmin/pkg/repositories/gormimpl/signal_repo.go index d1dec1bf1f..728376dc93 100644 --- a/flyteadmin/pkg/repositories/gormimpl/signal_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/signal_repo.go @@ -4,14 +4,14 @@ import ( "context" "errors" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "google.golang.org/grpc/codes" "gorm.io/gorm" - adminerrors "github.com/flyteorg/flyteadmin/pkg/errors" - flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + adminerrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + flyteAdminDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // SignalRepo is an implementation of SignalRepoInterface. diff --git a/flyteadmin/pkg/repositories/gormimpl/signal_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/signal_repo_test.go index 374b60df8f..13bbfae4b1 100644 --- a/flyteadmin/pkg/repositories/gormimpl/signal_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/signal_repo_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" mocket "github.com/Selvatico/go-mocket" diff --git a/flyteadmin/pkg/repositories/gormimpl/task_execution_repo.go b/flyteadmin/pkg/repositories/gormimpl/task_execution_repo.go index 8f3fd5ee80..08315dc59b 100644 --- a/flyteadmin/pkg/repositories/gormimpl/task_execution_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/task_execution_repo.go @@ -4,13 +4,13 @@ import ( "context" "errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "gorm.io/gorm" - flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + flyteAdminDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Implementation of TaskExecutionInterface. diff --git a/flyteadmin/pkg/repositories/gormimpl/task_execution_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/task_execution_repo_test.go index 64a79aee41..fde9816538 100644 --- a/flyteadmin/pkg/repositories/gormimpl/task_execution_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/task_execution_repo_test.go @@ -6,14 +6,14 @@ import ( "time" mocket "github.com/Selvatico/go-mocket" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) var taskPhase = core.TaskExecution_ABORTED.String() diff --git a/flyteadmin/pkg/repositories/gormimpl/task_repo.go b/flyteadmin/pkg/repositories/gormimpl/task_repo.go index 03e690751e..8ed95465f4 100644 --- a/flyteadmin/pkg/repositories/gormimpl/task_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/task_repo.go @@ -4,13 +4,13 @@ import ( "context" "errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "gorm.io/gorm" - flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + flyteAdminDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Implementation of TaskRepoInterface. diff --git a/flyteadmin/pkg/repositories/gormimpl/task_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/task_repo_test.go index 98fbdc0821..95d9fe5d13 100644 --- a/flyteadmin/pkg/repositories/gormimpl/task_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/task_repo_test.go @@ -4,17 +4,17 @@ import ( "context" "testing" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" mocket "github.com/Selvatico/go-mocket" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) const pythonTestTaskType = "python-task" diff --git a/flyteadmin/pkg/repositories/gormimpl/utils_for_test.go b/flyteadmin/pkg/repositories/gormimpl/utils_for_test.go index 3959033b65..c344527935 100644 --- a/flyteadmin/pkg/repositories/gormimpl/utils_for_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/utils_for_test.go @@ -4,7 +4,7 @@ package gormimpl import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mocket "github.com/Selvatico/go-mocket" diff --git a/flyteadmin/pkg/repositories/gormimpl/workflow_repo.go b/flyteadmin/pkg/repositories/gormimpl/workflow_repo.go index 8ade1e9b4d..024317805c 100644 --- a/flyteadmin/pkg/repositories/gormimpl/workflow_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/workflow_repo.go @@ -4,13 +4,13 @@ import ( "context" "errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "gorm.io/gorm" - flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + flyteAdminDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Implementation of WorkflowRepoInterface. diff --git a/flyteadmin/pkg/repositories/gormimpl/workflow_repo_test.go b/flyteadmin/pkg/repositories/gormimpl/workflow_repo_test.go index 7e173b937e..dd94d69ba9 100644 --- a/flyteadmin/pkg/repositories/gormimpl/workflow_repo_test.go +++ b/flyteadmin/pkg/repositories/gormimpl/workflow_repo_test.go @@ -5,14 +5,14 @@ import ( "testing" mocket "github.com/Selvatico/go-mocket" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - mockScope "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) var typedInterface = []byte{1, 2, 3} diff --git a/flyteadmin/pkg/repositories/interfaces/common.go b/flyteadmin/pkg/repositories/interfaces/common.go index 60065a20ca..9867c1e305 100644 --- a/flyteadmin/pkg/repositories/interfaces/common.go +++ b/flyteadmin/pkg/repositories/interfaces/common.go @@ -1,7 +1,7 @@ package interfaces import ( - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" ) // Parameters for getting an individual resource. diff --git a/flyteadmin/pkg/repositories/interfaces/description_entity.go b/flyteadmin/pkg/repositories/interfaces/description_entity.go index eeba05a3bc..210ea367dd 100644 --- a/flyteadmin/pkg/repositories/interfaces/description_entity.go +++ b/flyteadmin/pkg/repositories/interfaces/description_entity.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteadmin/pkg/repositories/interfaces/execution_event_repo.go b/flyteadmin/pkg/repositories/interfaces/execution_event_repo.go index 51f5193dea..2d78b14c8b 100644 --- a/flyteadmin/pkg/repositories/interfaces/execution_event_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/execution_event_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) //go:generate mockery -name=ExecutionEventRepoInterface -output=../mocks -case=underscore diff --git a/flyteadmin/pkg/repositories/interfaces/execution_repo.go b/flyteadmin/pkg/repositories/interfaces/execution_repo.go index 6a65d3d3f4..29e46c69ca 100644 --- a/flyteadmin/pkg/repositories/interfaces/execution_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/execution_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Defines the interface for interacting with workflow execution models. diff --git a/flyteadmin/pkg/repositories/interfaces/launch_plan_repo.go b/flyteadmin/pkg/repositories/interfaces/launch_plan_repo.go index 61afa93993..6d8add30b7 100644 --- a/flyteadmin/pkg/repositories/interfaces/launch_plan_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/launch_plan_repo.go @@ -5,7 +5,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Defines the interface for interacting with launch plan models. diff --git a/flyteadmin/pkg/repositories/interfaces/named_entity_repo.go b/flyteadmin/pkg/repositories/interfaces/named_entity_repo.go index 99d576ee68..db7ab3d69d 100644 --- a/flyteadmin/pkg/repositories/interfaces/named_entity_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/named_entity_repo.go @@ -5,7 +5,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type GetNamedEntityInput struct { diff --git a/flyteadmin/pkg/repositories/interfaces/node_execution_event_repo.go b/flyteadmin/pkg/repositories/interfaces/node_execution_event_repo.go index db12395963..cadbd4b727 100644 --- a/flyteadmin/pkg/repositories/interfaces/node_execution_event_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/node_execution_event_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) //go:generate mockery -name=NodeExecutionEventRepoInterface -output=../mocks -case=underscore diff --git a/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go b/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go index 384d11afb8..a71bc37145 100644 --- a/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteadmin/pkg/repositories/interfaces/project_repo.go b/flyteadmin/pkg/repositories/interfaces/project_repo.go index aef098ed69..d523c6859a 100644 --- a/flyteadmin/pkg/repositories/interfaces/project_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/project_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type ProjectRepoInterface interface { diff --git a/flyteadmin/pkg/repositories/interfaces/repository.go b/flyteadmin/pkg/repositories/interfaces/repository.go index 904de1e484..002db054b2 100644 --- a/flyteadmin/pkg/repositories/interfaces/repository.go +++ b/flyteadmin/pkg/repositories/interfaces/repository.go @@ -1,7 +1,7 @@ package interfaces import ( - schedulerInterfaces "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" + schedulerInterfaces "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/repositories/interfaces/resource_repo.go b/flyteadmin/pkg/repositories/interfaces/resource_repo.go index 5ffbe0127d..abf7b91870 100644 --- a/flyteadmin/pkg/repositories/interfaces/resource_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/resource_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type ResourceRepoInterface interface { diff --git a/flyteadmin/pkg/repositories/interfaces/signal_repo.go b/flyteadmin/pkg/repositories/interfaces/signal_repo.go index f26ca065cf..cf06f70ca0 100644 --- a/flyteadmin/pkg/repositories/interfaces/signal_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/signal_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteadmin/pkg/repositories/interfaces/task_execution_repo.go b/flyteadmin/pkg/repositories/interfaces/task_execution_repo.go index 4ef26c1168..cee8552f6b 100644 --- a/flyteadmin/pkg/repositories/interfaces/task_execution_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/task_execution_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteadmin/pkg/repositories/interfaces/task_repo.go b/flyteadmin/pkg/repositories/interfaces/task_repo.go index 443200c82a..15c8e39724 100644 --- a/flyteadmin/pkg/repositories/interfaces/task_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/task_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Defines the interface for interacting with Task models. diff --git a/flyteadmin/pkg/repositories/interfaces/workflow_repo.go b/flyteadmin/pkg/repositories/interfaces/workflow_repo.go index 5e957db95e..12bedad32a 100644 --- a/flyteadmin/pkg/repositories/interfaces/workflow_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/workflow_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // Defines the interface for interacting with Workflow models. diff --git a/flyteadmin/pkg/repositories/mocks/description_entity_repo.go b/flyteadmin/pkg/repositories/mocks/description_entity_repo.go index 0e4fec93ac..5ff5c0b380 100644 --- a/flyteadmin/pkg/repositories/mocks/description_entity_repo.go +++ b/flyteadmin/pkg/repositories/mocks/description_entity_repo.go @@ -4,8 +4,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateDescriptionEntityFunc func(input models.DescriptionEntity) error diff --git a/flyteadmin/pkg/repositories/mocks/execution_event_repo_interface.go b/flyteadmin/pkg/repositories/mocks/execution_event_repo_interface.go index ebd59e51e6..c148809464 100644 --- a/flyteadmin/pkg/repositories/mocks/execution_event_repo_interface.go +++ b/flyteadmin/pkg/repositories/mocks/execution_event_repo_interface.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/flyteadmin/pkg/repositories/models" + models "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // ExecutionEventRepoInterface is an autogenerated mock type for the ExecutionEventRepoInterface type diff --git a/flyteadmin/pkg/repositories/mocks/execution_repo.go b/flyteadmin/pkg/repositories/mocks/execution_repo.go index 19e4980fe8..8649bcaa3c 100644 --- a/flyteadmin/pkg/repositories/mocks/execution_repo.go +++ b/flyteadmin/pkg/repositories/mocks/execution_repo.go @@ -3,8 +3,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateExecutionFunc func(ctx context.Context, input models.Execution) error diff --git a/flyteadmin/pkg/repositories/mocks/launch_plan_repo.go b/flyteadmin/pkg/repositories/mocks/launch_plan_repo.go index 1d53fdc224..e07dd65570 100644 --- a/flyteadmin/pkg/repositories/mocks/launch_plan_repo.go +++ b/flyteadmin/pkg/repositories/mocks/launch_plan_repo.go @@ -4,8 +4,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateLaunchPlanFunc func(input models.LaunchPlan) error diff --git a/flyteadmin/pkg/repositories/mocks/named_entity_metadata_repo.go b/flyteadmin/pkg/repositories/mocks/named_entity_metadata_repo.go index bcbc5d890a..e686fb539a 100644 --- a/flyteadmin/pkg/repositories/mocks/named_entity_metadata_repo.go +++ b/flyteadmin/pkg/repositories/mocks/named_entity_metadata_repo.go @@ -4,8 +4,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type GetNamedEntityFunc func(input interfaces.GetNamedEntityInput) (models.NamedEntity, error) diff --git a/flyteadmin/pkg/repositories/mocks/node_execution_event_repo_interface.go b/flyteadmin/pkg/repositories/mocks/node_execution_event_repo_interface.go index 437caa1ae4..2152f1e99c 100644 --- a/flyteadmin/pkg/repositories/mocks/node_execution_event_repo_interface.go +++ b/flyteadmin/pkg/repositories/mocks/node_execution_event_repo_interface.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/flyteadmin/pkg/repositories/models" + models "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // NodeExecutionEventRepoInterface is an autogenerated mock type for the NodeExecutionEventRepoInterface type diff --git a/flyteadmin/pkg/repositories/mocks/node_execution_repo.go b/flyteadmin/pkg/repositories/mocks/node_execution_repo.go index 006b357bd8..763d4e17dc 100644 --- a/flyteadmin/pkg/repositories/mocks/node_execution_repo.go +++ b/flyteadmin/pkg/repositories/mocks/node_execution_repo.go @@ -3,8 +3,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateNodeExecutionFunc func(ctx context.Context, input *models.NodeExecution) error diff --git a/flyteadmin/pkg/repositories/mocks/project_repo.go b/flyteadmin/pkg/repositories/mocks/project_repo.go index 91a5a19dcc..4cdfc63e93 100644 --- a/flyteadmin/pkg/repositories/mocks/project_repo.go +++ b/flyteadmin/pkg/repositories/mocks/project_repo.go @@ -3,8 +3,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/repositories/mocks/repository.go b/flyteadmin/pkg/repositories/mocks/repository.go index 5899d82e2a..17d5ff2dad 100644 --- a/flyteadmin/pkg/repositories/mocks/repository.go +++ b/flyteadmin/pkg/repositories/mocks/repository.go @@ -1,9 +1,9 @@ package mocks import ( - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - sIface "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" - sMocks "github.com/flyteorg/flyteadmin/scheduler/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + sIface "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" + sMocks "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/mocks" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/repositories/mocks/resource.go b/flyteadmin/pkg/repositories/mocks/resource.go index 0def6351e3..ca131e8891 100644 --- a/flyteadmin/pkg/repositories/mocks/resource.go +++ b/flyteadmin/pkg/repositories/mocks/resource.go @@ -3,8 +3,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateOrUpdateResourceFunction func(ctx context.Context, input models.Resource) error diff --git a/flyteadmin/pkg/repositories/mocks/signal_repo_interface.go b/flyteadmin/pkg/repositories/mocks/signal_repo_interface.go index f603079115..9cbfd8d3b7 100644 --- a/flyteadmin/pkg/repositories/mocks/signal_repo_interface.go +++ b/flyteadmin/pkg/repositories/mocks/signal_repo_interface.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - interfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/flyteadmin/pkg/repositories/models" + models "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) // SignalRepoInterface is an autogenerated mock type for the SignalRepoInterface type diff --git a/flyteadmin/pkg/repositories/mocks/task_execution_repo.go b/flyteadmin/pkg/repositories/mocks/task_execution_repo.go index d2d1188edc..ceb5e92812 100644 --- a/flyteadmin/pkg/repositories/mocks/task_execution_repo.go +++ b/flyteadmin/pkg/repositories/mocks/task_execution_repo.go @@ -3,8 +3,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateTaskExecutionFunc func(ctx context.Context, input models.TaskExecution) error diff --git a/flyteadmin/pkg/repositories/mocks/task_repo.go b/flyteadmin/pkg/repositories/mocks/task_repo.go index c4d76fe991..191b9c238d 100644 --- a/flyteadmin/pkg/repositories/mocks/task_repo.go +++ b/flyteadmin/pkg/repositories/mocks/task_repo.go @@ -4,8 +4,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateTaskFunc func(input models.Task, descriptionEntity *models.DescriptionEntity) error diff --git a/flyteadmin/pkg/repositories/mocks/workflow_repo.go b/flyteadmin/pkg/repositories/mocks/workflow_repo.go index 5c9e8796a7..c58bf6b2d5 100644 --- a/flyteadmin/pkg/repositories/mocks/workflow_repo.go +++ b/flyteadmin/pkg/repositories/mocks/workflow_repo.go @@ -4,8 +4,8 @@ package mocks import ( "context" - "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) type CreateWorkflowFunc func(input models.Workflow, descriptionEntity *models.DescriptionEntity) error diff --git a/flyteadmin/pkg/repositories/models/execution.go b/flyteadmin/pkg/repositories/models/execution.go index 87e2c6c2d8..ca6f4d2388 100644 --- a/flyteadmin/pkg/repositories/models/execution.go +++ b/flyteadmin/pkg/repositories/models/execution.go @@ -7,7 +7,7 @@ import ( "gorm.io/gorm" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" ) // IMPORTANT: If you update the model below, be sure to double check model definitions in diff --git a/flyteadmin/pkg/repositories/transformers/description_entity.go b/flyteadmin/pkg/repositories/transformers/description_entity.go index e57aa1ba1a..2726677566 100644 --- a/flyteadmin/pkg/repositories/transformers/description_entity.go +++ b/flyteadmin/pkg/repositories/transformers/description_entity.go @@ -5,10 +5,10 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/repositories/transformers/description_entity_test.go b/flyteadmin/pkg/repositories/transformers/description_entity_test.go index 344134595e..c3eb7867c6 100644 --- a/flyteadmin/pkg/repositories/transformers/description_entity_test.go +++ b/flyteadmin/pkg/repositories/transformers/description_entity_test.go @@ -3,7 +3,7 @@ package transformers import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/repositories/transformers/execution.go b/flyteadmin/pkg/repositories/transformers/execution.go index 71f90a6546..4fe3086db8 100644 --- a/flyteadmin/pkg/repositories/transformers/execution.go +++ b/flyteadmin/pkg/repositories/transformers/execution.go @@ -6,14 +6,14 @@ import ( "strings" "time" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" diff --git a/flyteadmin/pkg/repositories/transformers/execution_event.go b/flyteadmin/pkg/repositories/transformers/execution_event.go index ef4cd9e974..64581cfb0d 100644 --- a/flyteadmin/pkg/repositories/transformers/execution_event.go +++ b/flyteadmin/pkg/repositories/transformers/execution_event.go @@ -1,8 +1,8 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/ptypes" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/repositories/transformers/execution_event_test.go b/flyteadmin/pkg/repositories/transformers/execution_event_test.go index f58b4a5b38..e1ecc51d48 100644 --- a/flyteadmin/pkg/repositories/transformers/execution_event_test.go +++ b/flyteadmin/pkg/repositories/transformers/execution_event_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteadmin/pkg/repositories/transformers/execution_test.go b/flyteadmin/pkg/repositories/transformers/execution_test.go index 215d700c2a..88f3a550a3 100644 --- a/flyteadmin/pkg/repositories/transformers/execution_test.go +++ b/flyteadmin/pkg/repositories/transformers/execution_test.go @@ -8,14 +8,14 @@ import ( "time" "unicode/utf8" - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/storage" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" "github.com/golang/protobuf/ptypes" @@ -25,8 +25,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) func getRunningExecutionModel(specBytes []byte, existingClosureBytes []byte, startedAt time.Time) models.Execution { diff --git a/flyteadmin/pkg/repositories/transformers/init_test.go b/flyteadmin/pkg/repositories/transformers/init_test.go index 9fac6e6f56..9bd78c625f 100644 --- a/flyteadmin/pkg/repositories/transformers/init_test.go +++ b/flyteadmin/pkg/repositories/transformers/init_test.go @@ -1,8 +1,8 @@ package transformers import ( - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) func init() { diff --git a/flyteadmin/pkg/repositories/transformers/launch_plan.go b/flyteadmin/pkg/repositories/transformers/launch_plan.go index 36ef7dc502..bae2798199 100644 --- a/flyteadmin/pkg/repositories/transformers/launch_plan.go +++ b/flyteadmin/pkg/repositories/transformers/launch_plan.go @@ -1,8 +1,8 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/repositories/transformers/launch_plan_test.go b/flyteadmin/pkg/repositories/transformers/launch_plan_test.go index 82e4ebde78..2dbbc995c6 100644 --- a/flyteadmin/pkg/repositories/transformers/launch_plan_test.go +++ b/flyteadmin/pkg/repositories/transformers/launch_plan_test.go @@ -6,8 +6,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" diff --git a/flyteadmin/pkg/repositories/transformers/named_entity.go b/flyteadmin/pkg/repositories/transformers/named_entity.go index 9bda1746c0..ed49d8627a 100644 --- a/flyteadmin/pkg/repositories/transformers/named_entity.go +++ b/flyteadmin/pkg/repositories/transformers/named_entity.go @@ -1,7 +1,7 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/pkg/repositories/transformers/named_entity_test.go b/flyteadmin/pkg/repositories/transformers/named_entity_test.go index f202a605a0..68daf94f15 100644 --- a/flyteadmin/pkg/repositories/transformers/named_entity_test.go +++ b/flyteadmin/pkg/repositories/transformers/named_entity_test.go @@ -3,7 +3,7 @@ package transformers import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/repositories/transformers/node_execution.go b/flyteadmin/pkg/repositories/transformers/node_execution.go index 7eb57a70b9..6707b0273f 100644 --- a/flyteadmin/pkg/repositories/transformers/node_execution.go +++ b/flyteadmin/pkg/repositories/transformers/node_execution.go @@ -5,21 +5,21 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" "github.com/golang/protobuf/proto" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/ptypes" - "github.com/flyteorg/flyteadmin/pkg/errors" - genModel "github.com/flyteorg/flyteadmin/pkg/repositories/gen/models" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + genModel "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/gen/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/repositories/transformers/node_execution_event.go b/flyteadmin/pkg/repositories/transformers/node_execution_event.go index 5c3833d28e..99fb85f955 100644 --- a/flyteadmin/pkg/repositories/transformers/node_execution_event.go +++ b/flyteadmin/pkg/repositories/transformers/node_execution_event.go @@ -1,8 +1,8 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/ptypes" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/repositories/transformers/node_execution_event_test.go b/flyteadmin/pkg/repositories/transformers/node_execution_event_test.go index 657e4ce5c1..f676b60c5c 100644 --- a/flyteadmin/pkg/repositories/transformers/node_execution_event_test.go +++ b/flyteadmin/pkg/repositories/transformers/node_execution_event_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flyteadmin/pkg/repositories/transformers/node_execution_test.go b/flyteadmin/pkg/repositories/transformers/node_execution_test.go index 88ef8fc26b..57f1c491b2 100644 --- a/flyteadmin/pkg/repositories/transformers/node_execution_test.go +++ b/flyteadmin/pkg/repositories/transformers/node_execution_test.go @@ -5,26 +5,26 @@ import ( "testing" "time" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flytestdlib/promutils" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/storage" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/ptypes" - genModel "github.com/flyteorg/flyteadmin/pkg/repositories/gen/models" + genModel "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/gen/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" ) var occurredAt = time.Now().UTC() diff --git a/flyteadmin/pkg/repositories/transformers/project.go b/flyteadmin/pkg/repositories/transformers/project.go index 23e9145179..bec58c7a89 100644 --- a/flyteadmin/pkg/repositories/transformers/project.go +++ b/flyteadmin/pkg/repositories/transformers/project.go @@ -1,7 +1,7 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/repositories/transformers/project_test.go b/flyteadmin/pkg/repositories/transformers/project_test.go index 7a5eac20e3..bc197ab58f 100644 --- a/flyteadmin/pkg/repositories/transformers/project_test.go +++ b/flyteadmin/pkg/repositories/transformers/project_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/repositories/transformers/resource.go b/flyteadmin/pkg/repositories/transformers/resource.go index f59e44593e..0ba092833c 100644 --- a/flyteadmin/pkg/repositories/transformers/resource.go +++ b/flyteadmin/pkg/repositories/transformers/resource.go @@ -3,12 +3,12 @@ package transformers import ( "context" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flytestdlib/logger" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/proto" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/repositories/transformers/resource_test.go b/flyteadmin/pkg/repositories/transformers/resource_test.go index 1a7a32b1b5..41cd560b92 100644 --- a/flyteadmin/pkg/repositories/transformers/resource_test.go +++ b/flyteadmin/pkg/repositories/transformers/resource_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/common/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/common/testutils" "github.com/golang/protobuf/proto" - "github.com/flyteorg/flyteadmin/pkg/errors" - repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + repoInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/repositories/transformers/signal.go b/flyteadmin/pkg/repositories/transformers/signal.go index 69bb7af014..9c07b823c7 100644 --- a/flyteadmin/pkg/repositories/transformers/signal.go +++ b/flyteadmin/pkg/repositories/transformers/signal.go @@ -1,8 +1,8 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteadmin/pkg/repositories/transformers/signal_test.go b/flyteadmin/pkg/repositories/transformers/signal_test.go index c43ed0bb62..478d739efd 100644 --- a/flyteadmin/pkg/repositories/transformers/signal_test.go +++ b/flyteadmin/pkg/repositories/transformers/signal_test.go @@ -3,7 +3,7 @@ package transformers import ( "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteadmin/pkg/repositories/transformers/task.go b/flyteadmin/pkg/repositories/transformers/task.go index 3bb7dbaaef..0b944fca42 100644 --- a/flyteadmin/pkg/repositories/transformers/task.go +++ b/flyteadmin/pkg/repositories/transformers/task.go @@ -2,8 +2,8 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/repositories/transformers/task_execution.go b/flyteadmin/pkg/repositories/transformers/task_execution.go index 8e0eef6dd2..62e83e287d 100644 --- a/flyteadmin/pkg/repositories/transformers/task_execution.go +++ b/flyteadmin/pkg/repositories/transformers/task_execution.go @@ -12,15 +12,15 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/protobuf/encoding/protojson" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" ) var empty _struct.Struct diff --git a/flyteadmin/pkg/repositories/transformers/task_execution_test.go b/flyteadmin/pkg/repositories/transformers/task_execution_test.go index e3155b12f7..46c520d8a5 100644 --- a/flyteadmin/pkg/repositories/transformers/task_execution_test.go +++ b/flyteadmin/pkg/repositories/transformers/task_execution_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - commonMocks "github.com/flyteorg/flyteadmin/pkg/common/mocks" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/storage" + commonMocks "github.com/flyteorg/flyte/flyteadmin/pkg/common/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/jsonpb" "google.golang.org/protobuf/types/known/structpb" @@ -22,7 +22,7 @@ import ( ptypesStruct "github.com/golang/protobuf/ptypes/struct" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flyteadmin/pkg/repositories/transformers/task_test.go b/flyteadmin/pkg/repositories/transformers/task_test.go index 7702aafc00..096955f4c4 100644 --- a/flyteadmin/pkg/repositories/transformers/task_test.go +++ b/flyteadmin/pkg/repositories/transformers/task_test.go @@ -9,8 +9,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/ptypes" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/repositories/transformers/workflow.go b/flyteadmin/pkg/repositories/transformers/workflow.go index ce9b75e000..d37afb79a0 100644 --- a/flyteadmin/pkg/repositories/transformers/workflow.go +++ b/flyteadmin/pkg/repositories/transformers/workflow.go @@ -1,8 +1,8 @@ package transformers import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/repositories/transformers/workflow_test.go b/flyteadmin/pkg/repositories/transformers/workflow_test.go index 282bd6c7a0..82b077362d 100644 --- a/flyteadmin/pkg/repositories/transformers/workflow_test.go +++ b/flyteadmin/pkg/repositories/transformers/workflow_test.go @@ -10,8 +10,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/rpc/adminservice/attributes.go b/flyteadmin/pkg/rpc/adminservice/attributes.go index 7f9a23efee..582e264044 100644 --- a/flyteadmin/pkg/rpc/adminservice/attributes.go +++ b/flyteadmin/pkg/rpc/adminservice/attributes.go @@ -3,7 +3,7 @@ package adminservice import ( "context" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/pkg/rpc/adminservice/base.go b/flyteadmin/pkg/rpc/adminservice/base.go index 77c78f480e..8b5753169e 100644 --- a/flyteadmin/pkg/rpc/adminservice/base.go +++ b/flyteadmin/pkg/rpc/adminservice/base.go @@ -5,30 +5,30 @@ import ( "fmt" "runtime/debug" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/plugins" - "github.com/flyteorg/flyteadmin/pkg/async/cloudevent" - runtimeIfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/cloudevent" + runtimeIfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" - eventWriter "github.com/flyteorg/flyteadmin/pkg/async/events/implementations" + eventWriter "github.com/flyteorg/flyte/flyteadmin/pkg/async/events/implementations" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/resources" - - "github.com/flyteorg/flyteadmin/pkg/async/notifications" - "github.com/flyteorg/flyteadmin/pkg/async/schedule" - "github.com/flyteorg/flyteadmin/pkg/data" - executionCluster "github.com/flyteorg/flyteadmin/pkg/executioncluster/impl" - manager "github.com/flyteorg/flyteadmin/pkg/manager/impl" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories" - workflowengineImpl "github.com/flyteorg/flyteadmin/pkg/workflowengine/impl" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/resources" + + "github.com/flyteorg/flyte/flyteadmin/pkg/async/notifications" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule" + "github.com/flyteorg/flyte/flyteadmin/pkg/data" + executionCluster "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/impl" + manager "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" + workflowengineImpl "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/impl" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/rpc/adminservice/base_test.go b/flyteadmin/pkg/rpc/adminservice/base_test.go index 6e3f1ab4a9..d049e19a70 100644 --- a/flyteadmin/pkg/rpc/adminservice/base_test.go +++ b/flyteadmin/pkg/rpc/adminservice/base_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/rpc/adminservice/description_entity.go b/flyteadmin/pkg/rpc/adminservice/description_entity.go index 72a9854fe4..731e6b117b 100644 --- a/flyteadmin/pkg/rpc/adminservice/description_entity.go +++ b/flyteadmin/pkg/rpc/adminservice/description_entity.go @@ -3,11 +3,11 @@ package adminservice import ( "context" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" + "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/flytestdlib/logger" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/flyteadmin/pkg/rpc/adminservice/execution.go b/flyteadmin/pkg/rpc/adminservice/execution.go index 87e2fe4873..3f9750b825 100644 --- a/flyteadmin/pkg/rpc/adminservice/execution.go +++ b/flyteadmin/pkg/rpc/adminservice/execution.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/pkg/rpc/adminservice/launch_plan.go b/flyteadmin/pkg/rpc/adminservice/launch_plan.go index 0ee96f1ffd..fc6361236d 100644 --- a/flyteadmin/pkg/rpc/adminservice/launch_plan.go +++ b/flyteadmin/pkg/rpc/adminservice/launch_plan.go @@ -3,10 +3,10 @@ package adminservice import ( "context" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/pkg/rpc/adminservice/metrics.go b/flyteadmin/pkg/rpc/adminservice/metrics.go index b2bab4514c..98eda0dc8c 100644 --- a/flyteadmin/pkg/rpc/adminservice/metrics.go +++ b/flyteadmin/pkg/rpc/adminservice/metrics.go @@ -2,8 +2,8 @@ package adminservice import ( - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteadmin/pkg/rpc/adminservice/named_entity.go b/flyteadmin/pkg/rpc/adminservice/named_entity.go index f1541d4096..d1f72318e2 100644 --- a/flyteadmin/pkg/rpc/adminservice/named_entity.go +++ b/flyteadmin/pkg/rpc/adminservice/named_entity.go @@ -3,7 +3,7 @@ package adminservice import ( "context" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/pkg/rpc/adminservice/node_execution.go b/flyteadmin/pkg/rpc/adminservice/node_execution.go index b4cabedf32..23ee97904f 100644 --- a/flyteadmin/pkg/rpc/adminservice/node_execution.go +++ b/flyteadmin/pkg/rpc/adminservice/node_execution.go @@ -3,9 +3,9 @@ package adminservice import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/rpc/adminservice/project.go b/flyteadmin/pkg/rpc/adminservice/project.go index e3b7a478e0..5d49904fec 100644 --- a/flyteadmin/pkg/rpc/adminservice/project.go +++ b/flyteadmin/pkg/rpc/adminservice/project.go @@ -3,7 +3,7 @@ package adminservice import ( "context" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/pkg/rpc/adminservice/task.go b/flyteadmin/pkg/rpc/adminservice/task.go index 8ab1463fc2..7c35e9864a 100644 --- a/flyteadmin/pkg/rpc/adminservice/task.go +++ b/flyteadmin/pkg/rpc/adminservice/task.go @@ -3,10 +3,10 @@ package adminservice import ( "context" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flyteadmin/pkg/rpc/adminservice/task_execution.go b/flyteadmin/pkg/rpc/adminservice/task_execution.go index b2b0d5f000..eaf1db145e 100644 --- a/flyteadmin/pkg/rpc/adminservice/task_execution.go +++ b/flyteadmin/pkg/rpc/adminservice/task_execution.go @@ -3,10 +3,10 @@ package adminservice import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/rpc/adminservice/tests/execution_test.go b/flyteadmin/pkg/rpc/adminservice/tests/execution_test.go index a086bff1e7..9b54df21ad 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/execution_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/execution_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - repoErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + repoErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/rpc/adminservice/tests/launch_plan_test.go b/flyteadmin/pkg/rpc/adminservice/tests/launch_plan_test.go index 3bca2b5da3..9cc6fc32c3 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/launch_plan_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/launch_plan_test.go @@ -6,8 +6,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/rpc/adminservice/tests/node_execution_test.go b/flyteadmin/pkg/rpc/adminservice/tests/node_execution_test.go index a5b403b8a9..495ad2909a 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/node_execution_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/node_execution_test.go @@ -5,14 +5,14 @@ import ( "errors" "testing" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" "google.golang.org/grpc/codes" "github.com/golang/protobuf/proto" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/rpc/adminservice/tests/project_domain_test.go b/flyteadmin/pkg/rpc/adminservice/tests/project_domain_test.go index cc84bb0bfc..de8d784adb 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/project_domain_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/project_domain_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/rpc/adminservice/tests/project_test.go b/flyteadmin/pkg/rpc/adminservice/tests/project_test.go index 9651423094..181109300e 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/project_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/project_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/rpc/adminservice/tests/task_execution_test.go b/flyteadmin/pkg/rpc/adminservice/tests/task_execution_test.go index a59a201969..6f2ad61d0a 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/task_execution_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/task_execution_test.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" - flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + flyteAdminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flyteadmin/pkg/rpc/adminservice/tests/task_test.go b/flyteadmin/pkg/rpc/adminservice/tests/task_test.go index 84a4c2ed55..6afb6fc9ce 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/task_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/task_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/rpc/adminservice/tests/util.go b/flyteadmin/pkg/rpc/adminservice/tests/util.go index 1cd209d8c1..97a939a124 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/util.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/util.go @@ -1,9 +1,9 @@ package tests import ( - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice" - mockScope "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" ) type NewMockAdminServerInput struct { diff --git a/flyteadmin/pkg/rpc/adminservice/tests/workflow_test.go b/flyteadmin/pkg/rpc/adminservice/tests/workflow_test.go index b2af4f9aa6..7157ba4459 100644 --- a/flyteadmin/pkg/rpc/adminservice/tests/workflow_test.go +++ b/flyteadmin/pkg/rpc/adminservice/tests/workflow_test.go @@ -6,8 +6,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/rpc/adminservice/util/metrics.go b/flyteadmin/pkg/rpc/adminservice/util/metrics.go index b173ebc468..d39c799597 100644 --- a/flyteadmin/pkg/rpc/adminservice/util/metrics.go +++ b/flyteadmin/pkg/rpc/adminservice/util/metrics.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/rpc/adminservice/util/transformers.go b/flyteadmin/pkg/rpc/adminservice/util/transformers.go index aa45e1429c..85aa2fefb1 100644 --- a/flyteadmin/pkg/rpc/adminservice/util/transformers.go +++ b/flyteadmin/pkg/rpc/adminservice/util/transformers.go @@ -4,8 +4,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" ) // TransformAndRecordError transforms errors to grpc-compatible error types and optionally truncates it if necessary. diff --git a/flyteadmin/pkg/rpc/adminservice/util/transformers_test.go b/flyteadmin/pkg/rpc/adminservice/util/transformers_test.go index 52398dc769..35f359dfa3 100644 --- a/flyteadmin/pkg/rpc/adminservice/util/transformers_test.go +++ b/flyteadmin/pkg/rpc/adminservice/util/transformers_test.go @@ -6,13 +6,13 @@ import ( "strings" "testing" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/flyteorg/flyteadmin/pkg/common" - adminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors" ) var testRequestMetrics = NewRequestMetrics(mockScope.NewTestScope(), "foo") diff --git a/flyteadmin/pkg/rpc/adminservice/workflow.go b/flyteadmin/pkg/rpc/adminservice/workflow.go index dad930ce94..0b057f7091 100644 --- a/flyteadmin/pkg/rpc/adminservice/workflow.go +++ b/flyteadmin/pkg/rpc/adminservice/workflow.go @@ -3,10 +3,10 @@ package adminservice import ( "context" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" diff --git a/flyteadmin/pkg/rpc/signal_service.go b/flyteadmin/pkg/rpc/signal_service.go index 2487003d9e..1790385fc1 100644 --- a/flyteadmin/pkg/rpc/signal_service.go +++ b/flyteadmin/pkg/rpc/signal_service.go @@ -5,18 +5,18 @@ import ( "fmt" "runtime/debug" - manager "github.com/flyteorg/flyteadmin/pkg/manager/impl" - "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" - runtimeIfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + manager "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice/util" + runtimeIfaces "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/service" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/rpc/signal_service_test.go b/flyteadmin/pkg/rpc/signal_service_test.go index b987edfdd2..e7ac8c5ab6 100644 --- a/flyteadmin/pkg/rpc/signal_service_test.go +++ b/flyteadmin/pkg/rpc/signal_service_test.go @@ -5,11 +5,11 @@ import ( "errors" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - mockScope "github.com/flyteorg/flytestdlib/promutils" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flyteadmin/pkg/runtime/application_config_provider.go b/flyteadmin/pkg/runtime/application_config_provider.go index 3b8b0a2707..a16c27e694 100644 --- a/flyteadmin/pkg/runtime/application_config_provider.go +++ b/flyteadmin/pkg/runtime/application_config_provider.go @@ -1,11 +1,11 @@ package runtime import ( - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/database" ) const flyteAdmin = "flyteadmin" diff --git a/flyteadmin/pkg/runtime/cluster_config_provider.go b/flyteadmin/pkg/runtime/cluster_config_provider.go index 7de2f17593..6e0c6e6f7d 100644 --- a/flyteadmin/pkg/runtime/cluster_config_provider.go +++ b/flyteadmin/pkg/runtime/cluster_config_provider.go @@ -3,11 +3,11 @@ package runtime import ( "context" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) const clustersKey = "clusters" diff --git a/flyteadmin/pkg/runtime/cluster_pool_assignment_provider.go b/flyteadmin/pkg/runtime/cluster_pool_assignment_provider.go index b6e2a406a2..1ba1e4a8a8 100644 --- a/flyteadmin/pkg/runtime/cluster_pool_assignment_provider.go +++ b/flyteadmin/pkg/runtime/cluster_pool_assignment_provider.go @@ -1,9 +1,9 @@ package runtime import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) const clusterPoolsKey = "clusterPools" diff --git a/flyteadmin/pkg/runtime/cluster_resource_provider.go b/flyteadmin/pkg/runtime/cluster_resource_provider.go index 30812b51a4..865d39e9b5 100644 --- a/flyteadmin/pkg/runtime/cluster_resource_provider.go +++ b/flyteadmin/pkg/runtime/cluster_resource_provider.go @@ -3,8 +3,8 @@ package runtime import ( "time" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/config" ) const clusterResourceKey = "cluster_resources" diff --git a/flyteadmin/pkg/runtime/cluster_resource_provider_test.go b/flyteadmin/pkg/runtime/cluster_resource_provider_test.go index 5bc52ed27d..2132ef52bd 100644 --- a/flyteadmin/pkg/runtime/cluster_resource_provider_test.go +++ b/flyteadmin/pkg/runtime/cluster_resource_provider_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" - "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/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/runtime/config_provider_test.go b/flyteadmin/pkg/runtime/config_provider_test.go index 6a02fe8c33..34c3772886 100644 --- a/flyteadmin/pkg/runtime/config_provider_test.go +++ b/flyteadmin/pkg/runtime/config_provider_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" - "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/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/runtime/configuration_provider.go b/flyteadmin/pkg/runtime/configuration_provider.go index 217d20dc54..bbaaaca486 100644 --- a/flyteadmin/pkg/runtime/configuration_provider.go +++ b/flyteadmin/pkg/runtime/configuration_provider.go @@ -1,7 +1,7 @@ package runtime import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) // Implementation of an interfaces.Configuration diff --git a/flyteadmin/pkg/runtime/execution_queue_provider.go b/flyteadmin/pkg/runtime/execution_queue_provider.go index f4e5a566d4..0f69130158 100644 --- a/flyteadmin/pkg/runtime/execution_queue_provider.go +++ b/flyteadmin/pkg/runtime/execution_queue_provider.go @@ -1,9 +1,9 @@ package runtime import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) const queuesKey = "queues" diff --git a/flyteadmin/pkg/runtime/interfaces/application_configuration.go b/flyteadmin/pkg/runtime/interfaces/application_configuration.go index cf9bf2e9ed..32c18b9d23 100644 --- a/flyteadmin/pkg/runtime/interfaces/application_configuration.go +++ b/flyteadmin/pkg/runtime/interfaces/application_configuration.go @@ -1,10 +1,10 @@ package interfaces import ( + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/database" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/database" "github.com/golang/protobuf/ptypes/wrappers" "golang.org/x/time/rate" diff --git a/flyteadmin/pkg/runtime/interfaces/cluster_configuration.go b/flyteadmin/pkg/runtime/interfaces/cluster_configuration.go index 491caed3f1..07d9e313da 100644 --- a/flyteadmin/pkg/runtime/interfaces/cluster_configuration.go +++ b/flyteadmin/pkg/runtime/interfaces/cluster_configuration.go @@ -3,7 +3,7 @@ package interfaces import ( "io/ioutil" - "github.com/flyteorg/flyteadmin/pkg/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" "github.com/pkg/errors" ) diff --git a/flyteadmin/pkg/runtime/interfaces/cluster_resource_configuration.go b/flyteadmin/pkg/runtime/interfaces/cluster_resource_configuration.go index feaa06cb3d..990537450f 100644 --- a/flyteadmin/pkg/runtime/interfaces/cluster_resource_configuration.go +++ b/flyteadmin/pkg/runtime/interfaces/cluster_resource_configuration.go @@ -3,7 +3,7 @@ package interfaces import ( "time" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) type DataSourceValueFrom struct { diff --git a/flyteadmin/pkg/runtime/interfaces/mocks/cluster_pool_assignment_configuration.go b/flyteadmin/pkg/runtime/interfaces/mocks/cluster_pool_assignment_configuration.go index 6e0c1719df..75fdf68f39 100644 --- a/flyteadmin/pkg/runtime/interfaces/mocks/cluster_pool_assignment_configuration.go +++ b/flyteadmin/pkg/runtime/interfaces/mocks/cluster_pool_assignment_configuration.go @@ -3,7 +3,7 @@ package mocks import ( - interfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/pkg/runtime/interfaces/quality_of_service_configuration.go b/flyteadmin/pkg/runtime/interfaces/quality_of_service_configuration.go index 34c5d92c51..11ae529376 100644 --- a/flyteadmin/pkg/runtime/interfaces/quality_of_service_configuration.go +++ b/flyteadmin/pkg/runtime/interfaces/quality_of_service_configuration.go @@ -1,8 +1,8 @@ package interfaces import ( + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/config" ) type TierName = string diff --git a/flyteadmin/pkg/runtime/mocks/cluster_configuration.go b/flyteadmin/pkg/runtime/mocks/cluster_configuration.go index 1fd8033ccc..09aa884b01 100644 --- a/flyteadmin/pkg/runtime/mocks/cluster_configuration.go +++ b/flyteadmin/pkg/runtime/mocks/cluster_configuration.go @@ -3,7 +3,7 @@ package mocks import ( - interfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/pkg/runtime/mocks/mock_application_provider.go b/flyteadmin/pkg/runtime/mocks/mock_application_provider.go index 13079619c1..f657685364 100644 --- a/flyteadmin/pkg/runtime/mocks/mock_application_provider.go +++ b/flyteadmin/pkg/runtime/mocks/mock_application_provider.go @@ -1,8 +1,8 @@ package mocks import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/database" ) type MockApplicationProvider struct { diff --git a/flyteadmin/pkg/runtime/mocks/mock_cluster_resource_provider.go b/flyteadmin/pkg/runtime/mocks/mock_cluster_resource_provider.go index 500f849ba5..d658c1e3cb 100644 --- a/flyteadmin/pkg/runtime/mocks/mock_cluster_resource_provider.go +++ b/flyteadmin/pkg/runtime/mocks/mock_cluster_resource_provider.go @@ -3,7 +3,7 @@ package mocks import ( "time" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" ) type MockClusterResourceConfiguration struct { diff --git a/flyteadmin/pkg/runtime/mocks/mock_configuration_provider.go b/flyteadmin/pkg/runtime/mocks/mock_configuration_provider.go index 2e85777364..7f1d79a6d5 100644 --- a/flyteadmin/pkg/runtime/mocks/mock_configuration_provider.go +++ b/flyteadmin/pkg/runtime/mocks/mock_configuration_provider.go @@ -1,8 +1,8 @@ package mocks import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - ifaceMocks "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + ifaceMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteadmin/pkg/runtime/mocks/mock_execution_queue_provider.go b/flyteadmin/pkg/runtime/mocks/mock_execution_queue_provider.go index b4987ccec3..437262953f 100644 --- a/flyteadmin/pkg/runtime/mocks/mock_execution_queue_provider.go +++ b/flyteadmin/pkg/runtime/mocks/mock_execution_queue_provider.go @@ -1,6 +1,6 @@ package mocks -import "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" +import "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" type MockQueueConfigurationProvider struct { executionQueues []interfaces.ExecutionQueue diff --git a/flyteadmin/pkg/runtime/mocks/mock_registration_validation_provider.go b/flyteadmin/pkg/runtime/mocks/mock_registration_validation_provider.go index 41f2a51232..e043e0d0a4 100644 --- a/flyteadmin/pkg/runtime/mocks/mock_registration_validation_provider.go +++ b/flyteadmin/pkg/runtime/mocks/mock_registration_validation_provider.go @@ -1,6 +1,6 @@ package mocks -import "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" +import "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" type MockRegistrationValidationProvider struct { WorkflowNodeLimit int diff --git a/flyteadmin/pkg/runtime/mocks/mock_task_resource_provider.go b/flyteadmin/pkg/runtime/mocks/mock_task_resource_provider.go index e1e99a45b4..654ae6d381 100644 --- a/flyteadmin/pkg/runtime/mocks/mock_task_resource_provider.go +++ b/flyteadmin/pkg/runtime/mocks/mock_task_resource_provider.go @@ -1,6 +1,6 @@ package mocks -import "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" +import "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" type MockTaskResourceConfiguration struct { Defaults interfaces.TaskResourceSet diff --git a/flyteadmin/pkg/runtime/mocks/mock_whitelist_provider.go b/flyteadmin/pkg/runtime/mocks/mock_whitelist_provider.go index 642040f3b7..f419ca55eb 100644 --- a/flyteadmin/pkg/runtime/mocks/mock_whitelist_provider.go +++ b/flyteadmin/pkg/runtime/mocks/mock_whitelist_provider.go @@ -1,6 +1,6 @@ package mocks -import "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" +import "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" type MockWhitelistConfiguration struct { TaskTypeWhitelist interfaces.TaskTypeWhitelist diff --git a/flyteadmin/pkg/runtime/namespace_config_provider.go b/flyteadmin/pkg/runtime/namespace_config_provider.go index c252345215..e11b9520ba 100644 --- a/flyteadmin/pkg/runtime/namespace_config_provider.go +++ b/flyteadmin/pkg/runtime/namespace_config_provider.go @@ -3,9 +3,9 @@ package runtime import ( "context" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/flyteadmin/pkg/runtime/quality_of_service_provider.go b/flyteadmin/pkg/runtime/quality_of_service_provider.go index b611446522..30a98b9cba 100644 --- a/flyteadmin/pkg/runtime/quality_of_service_provider.go +++ b/flyteadmin/pkg/runtime/quality_of_service_provider.go @@ -3,9 +3,9 @@ package runtime import ( "fmt" - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/config" "github.com/golang/protobuf/ptypes" ) diff --git a/flyteadmin/pkg/runtime/registration_validation_provider.go b/flyteadmin/pkg/runtime/registration_validation_provider.go index d32050a5c7..9f6560f7f2 100644 --- a/flyteadmin/pkg/runtime/registration_validation_provider.go +++ b/flyteadmin/pkg/runtime/registration_validation_provider.go @@ -2,8 +2,8 @@ package runtime import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/config" ) const registration = "registration" diff --git a/flyteadmin/pkg/runtime/task_resource_provider.go b/flyteadmin/pkg/runtime/task_resource_provider.go index d8baa2fe1a..27a94ab0eb 100644 --- a/flyteadmin/pkg/runtime/task_resource_provider.go +++ b/flyteadmin/pkg/runtime/task_resource_provider.go @@ -1,8 +1,8 @@ package runtime import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/config" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/flyteadmin/pkg/runtime/whitelist_provider.go b/flyteadmin/pkg/runtime/whitelist_provider.go index 05fd6aae15..55196d78ce 100644 --- a/flyteadmin/pkg/runtime/whitelist_provider.go +++ b/flyteadmin/pkg/runtime/whitelist_provider.go @@ -1,8 +1,8 @@ package runtime import ( - "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytestdlib/config" ) const whitelistKey = "task_type_whitelist" diff --git a/flyteadmin/pkg/server/cert_utils.go b/flyteadmin/pkg/server/cert_utils.go index 442f370fc4..1b66765082 100644 --- a/flyteadmin/pkg/server/cert_utils.go +++ b/flyteadmin/pkg/server/cert_utils.go @@ -5,8 +5,8 @@ import ( "crypto/tls" "crypto/x509" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "io/ioutil" ) diff --git a/flyteadmin/pkg/server/initialize.go b/flyteadmin/pkg/server/initialize.go index 69c3846769..9a7483e9b9 100644 --- a/flyteadmin/pkg/server/initialize.go +++ b/flyteadmin/pkg/server/initialize.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/flyteorg/flyteadmin/pkg/repositories" - "github.com/flyteorg/flyteadmin/pkg/repositories/config" - "github.com/flyteorg/flyteadmin/pkg/runtime" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/gorm" ) diff --git a/flyteadmin/pkg/server/service.go b/flyteadmin/pkg/server/service.go index b060c3ec79..8a99a93278 100644 --- a/flyteadmin/pkg/server/service.go +++ b/flyteadmin/pkg/server/service.go @@ -23,25 +23,25 @@ import ( "google.golang.org/grpc/reflection" "k8s.io/apimachinery/pkg/util/rand" - "github.com/flyteorg/flyteadmin/auth" - "github.com/flyteorg/flyteadmin/auth/authzserver" - authConfig "github.com/flyteorg/flyteadmin/auth/config" - "github.com/flyteorg/flyteadmin/auth/interfaces" - "github.com/flyteorg/flyteadmin/dataproxy" - "github.com/flyteorg/flyteadmin/pkg/common" - "github.com/flyteorg/flyteadmin/pkg/config" - "github.com/flyteorg/flyteadmin/pkg/rpc" - "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice" - runtime2 "github.com/flyteorg/flyteadmin/pkg/runtime" - runtimeIfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flyteadmin/plugins" + "github.com/flyteorg/flyte/flyteadmin/auth" + "github.com/flyteorg/flyte/flyteadmin/auth/authzserver" + authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config" + "github.com/flyteorg/flyte/flyteadmin/auth/interfaces" + "github.com/flyteorg/flyte/flyteadmin/dataproxy" + "github.com/flyteorg/flyte/flyteadmin/pkg/common" + "github.com/flyteorg/flyte/flyteadmin/pkg/config" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc" + "github.com/flyteorg/flyte/flyteadmin/pkg/rpc/adminservice" + runtime2 "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + runtimeIfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/plugins" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/secretmanager" + "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" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/secretmanager" - "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" ) var defaultCorsHeaders = []string{"Content-Type"} diff --git a/flyteadmin/pkg/workflowengine/impl/compiler.go b/flyteadmin/pkg/workflowengine/impl/compiler.go index 0d97d6ccc8..e180696817 100644 --- a/flyteadmin/pkg/workflowengine/impl/compiler.go +++ b/flyteadmin/pkg/workflowengine/impl/compiler.go @@ -1,11 +1,11 @@ package impl import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" "google.golang.org/grpc/codes" ) diff --git a/flyteadmin/pkg/workflowengine/impl/interface_provider.go b/flyteadmin/pkg/workflowengine/impl/interface_provider.go index 12204832f1..a1ac2de410 100644 --- a/flyteadmin/pkg/workflowengine/impl/interface_provider.go +++ b/flyteadmin/pkg/workflowengine/impl/interface_provider.go @@ -3,12 +3,12 @@ package impl import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" "github.com/golang/protobuf/proto" ) diff --git a/flyteadmin/pkg/workflowengine/impl/interface_provider_test.go b/flyteadmin/pkg/workflowengine/impl/interface_provider_test.go index a3591325c6..3cfbdd4b7d 100644 --- a/flyteadmin/pkg/workflowengine/impl/interface_provider_test.go +++ b/flyteadmin/pkg/workflowengine/impl/interface_provider_test.go @@ -5,10 +5,10 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/pkg/workflowengine/impl/k8s_executor.go b/flyteadmin/pkg/workflowengine/impl/k8s_executor.go index 293030fe21..db3957b41f 100644 --- a/flyteadmin/pkg/workflowengine/impl/k8s_executor.go +++ b/flyteadmin/pkg/workflowengine/impl/k8s_executor.go @@ -3,13 +3,13 @@ package impl import ( "context" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - execClusterInterfaces "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + execClusterInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "google.golang.org/grpc/codes" k8_api_err "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flyteadmin/pkg/workflowengine/impl/k8s_executor_test.go b/flyteadmin/pkg/workflowengine/impl/k8s_executor_test.go index 3170a7aef9..8726c7598d 100644 --- a/flyteadmin/pkg/workflowengine/impl/k8s_executor_test.go +++ b/flyteadmin/pkg/workflowengine/impl/k8s_executor_test.go @@ -5,18 +5,18 @@ import ( "errors" "testing" - "github.com/flyteorg/flyteadmin/pkg/executioncluster" - execClusterIfaces "github.com/flyteorg/flyteadmin/pkg/executioncluster/interfaces" - clusterMock "github.com/flyteorg/flyteadmin/pkg/executioncluster/mocks" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - runtimeMocks "github.com/flyteorg/flyteadmin/pkg/runtime/mocks" - "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" - "github.com/flyteorg/flyteadmin/pkg/workflowengine/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster" + execClusterIfaces "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/interfaces" + clusterMock "github.com/flyteorg/flyte/flyteadmin/pkg/executioncluster/mocks" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + runtimeMocks "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + flyteclient "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" + v1alpha12 "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - flyteclient "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" - v1alpha12 "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" "github.com/stretchr/testify/assert" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/pkg/workflowengine/impl/prepare_execution.go b/flyteadmin/pkg/workflowengine/impl/prepare_execution.go index 30b76fd9be..719f387c80 100644 --- a/flyteadmin/pkg/workflowengine/impl/prepare_execution.go +++ b/flyteadmin/pkg/workflowengine/impl/prepare_execution.go @@ -1,11 +1,11 @@ package impl import ( - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "google.golang.org/grpc/codes" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flyteadmin/pkg/workflowengine/impl/prepare_execution_test.go b/flyteadmin/pkg/workflowengine/impl/prepare_execution_test.go index 60925c08b1..768ec93828 100644 --- a/flyteadmin/pkg/workflowengine/impl/prepare_execution_test.go +++ b/flyteadmin/pkg/workflowengine/impl/prepare_execution_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/wrappers" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/pkg/workflowengine/impl/workflow_builder.go b/flyteadmin/pkg/workflowengine/impl/workflow_builder.go index 0ef05a8b0b..2892104db0 100644 --- a/flyteadmin/pkg/workflowengine/impl/workflow_builder.go +++ b/flyteadmin/pkg/workflowengine/impl/workflow_builder.go @@ -1,14 +1,14 @@ package impl import ( - "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" ) type builderMetrics struct { diff --git a/flyteadmin/pkg/workflowengine/interfaces/builder.go b/flyteadmin/pkg/workflowengine/interfaces/builder.go index 0c2b3e1f74..d0b9af5ff7 100644 --- a/flyteadmin/pkg/workflowengine/interfaces/builder.go +++ b/flyteadmin/pkg/workflowengine/interfaces/builder.go @@ -1,8 +1,8 @@ package interfaces import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) //go:generate mockery -name FlyteWorkflowBuilder -output=../mocks -case=underscore diff --git a/flyteadmin/pkg/workflowengine/interfaces/compiler.go b/flyteadmin/pkg/workflowengine/interfaces/compiler.go index 37902cbf78..bd342499a3 100644 --- a/flyteadmin/pkg/workflowengine/interfaces/compiler.go +++ b/flyteadmin/pkg/workflowengine/interfaces/compiler.go @@ -1,9 +1,9 @@ package interfaces import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" ) // Workflow compiler interface. diff --git a/flyteadmin/pkg/workflowengine/interfaces/executor.go b/flyteadmin/pkg/workflowengine/interfaces/executor.go index 848cbff74c..667e80fdd9 100644 --- a/flyteadmin/pkg/workflowengine/interfaces/executor.go +++ b/flyteadmin/pkg/workflowengine/interfaces/executor.go @@ -4,12 +4,12 @@ import ( "context" "time" - runtime "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + runtime "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/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" ) //go:generate mockery -name=WorkflowExecutor -output=../mocks/ -case=underscore diff --git a/flyteadmin/pkg/workflowengine/mocks/flyte_workflow_builder.go b/flyteadmin/pkg/workflowengine/mocks/flyte_workflow_builder.go index 614a528b97..831b42b0be 100644 --- a/flyteadmin/pkg/workflowengine/mocks/flyte_workflow_builder.go +++ b/flyteadmin/pkg/workflowengine/mocks/flyte_workflow_builder.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // FlyteWorkflowBuilder is an autogenerated mock type for the FlyteWorkflowBuilder type diff --git a/flyteadmin/pkg/workflowengine/mocks/mock_compiler.go b/flyteadmin/pkg/workflowengine/mocks/mock_compiler.go index 7b6f2cd419..b86c78d4b5 100644 --- a/flyteadmin/pkg/workflowengine/mocks/mock_compiler.go +++ b/flyteadmin/pkg/workflowengine/mocks/mock_compiler.go @@ -1,10 +1,10 @@ package mocks import ( - "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" ) type MockCompiler struct { diff --git a/flyteadmin/pkg/workflowengine/mocks/workflow_executor.go b/flyteadmin/pkg/workflowengine/mocks/workflow_executor.go index cb3c2bf927..db0cece8f0 100644 --- a/flyteadmin/pkg/workflowengine/mocks/workflow_executor.go +++ b/flyteadmin/pkg/workflowengine/mocks/workflow_executor.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - interfaces "github.com/flyteorg/flyteadmin/pkg/workflowengine/interfaces" + interfaces "github.com/flyteorg/flyte/flyteadmin/pkg/workflowengine/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteadmin/scheduler/core/gocron_job.go b/flyteadmin/scheduler/core/gocron_job.go index 373d56461b..9354a9baa3 100644 --- a/flyteadmin/scheduler/core/gocron_job.go +++ b/flyteadmin/scheduler/core/gocron_job.go @@ -6,9 +6,9 @@ import ( "runtime/pprof" "time" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/robfig/cron/v3" ) diff --git a/flyteadmin/scheduler/core/gocron_scheduler.go b/flyteadmin/scheduler/core/gocron_scheduler.go index 83ab671453..0a8080e6a4 100644 --- a/flyteadmin/scheduler/core/gocron_scheduler.go +++ b/flyteadmin/scheduler/core/gocron_scheduler.go @@ -6,13 +6,13 @@ import ( "sync" "time" - "github.com/flyteorg/flyteadmin/scheduler/executor" - "github.com/flyteorg/flyteadmin/scheduler/identifier" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flyteadmin/scheduler/snapshoter" + "github.com/flyteorg/flyte/flyteadmin/scheduler/executor" + "github.com/flyteorg/flyte/flyteadmin/scheduler/identifier" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/snapshoter" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" "github.com/robfig/cron/v3" diff --git a/flyteadmin/scheduler/core/gocron_scheduler_test.go b/flyteadmin/scheduler/core/gocron_scheduler_test.go index 3a936e0613..0b8890e418 100644 --- a/flyteadmin/scheduler/core/gocron_scheduler_test.go +++ b/flyteadmin/scheduler/core/gocron_scheduler_test.go @@ -13,13 +13,13 @@ import ( "github.com/stretchr/testify/mock" "golang.org/x/time/rate" - adminModels "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/runtime" - "github.com/flyteorg/flyteadmin/scheduler/executor/mocks" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flyteadmin/scheduler/snapshoter" + adminModels "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flyteadmin/scheduler/executor/mocks" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/snapshoter" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" ) var scheduleCron models.SchedulableEntity diff --git a/flyteadmin/scheduler/core/scheduler.go b/flyteadmin/scheduler/core/scheduler.go index 0f670e147e..384db76382 100644 --- a/flyteadmin/scheduler/core/scheduler.go +++ b/flyteadmin/scheduler/core/scheduler.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flyteadmin/scheduler/snapshoter" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/snapshoter" ) type TimedFuncWithSchedule func(ctx context.Context, s models.SchedulableEntity, t time.Time) error diff --git a/flyteadmin/scheduler/core/snapshot_runner.go b/flyteadmin/scheduler/core/snapshot_runner.go index 55f6e31642..47263324b2 100644 --- a/flyteadmin/scheduler/core/snapshot_runner.go +++ b/flyteadmin/scheduler/core/snapshot_runner.go @@ -3,7 +3,7 @@ package core import ( "context" - sImpl "github.com/flyteorg/flyteadmin/scheduler/snapshoter" + sImpl "github.com/flyteorg/flyte/flyteadmin/scheduler/snapshoter" ) const snapShotVersion = 1 diff --git a/flyteadmin/scheduler/core/updater.go b/flyteadmin/scheduler/core/updater.go index 91457f15a8..8684a1bacd 100644 --- a/flyteadmin/scheduler/core/updater.go +++ b/flyteadmin/scheduler/core/updater.go @@ -3,9 +3,9 @@ package core import ( "context" - repositoryInterfaces "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) // Updater this updates the scheduler with the latest state of schedules from the DB. diff --git a/flyteadmin/scheduler/dbapi/event_scheduler_impl.go b/flyteadmin/scheduler/dbapi/event_scheduler_impl.go index 6975263d26..87d69884a1 100644 --- a/flyteadmin/scheduler/dbapi/event_scheduler_impl.go +++ b/flyteadmin/scheduler/dbapi/event_scheduler_impl.go @@ -4,15 +4,15 @@ import ( "context" "fmt" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - scheduleInterfaces "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" + scheduleInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "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/flytestdlib/logger" ) // eventScheduler used for saving the scheduler entries after launch plans are enabled or disabled. diff --git a/flyteadmin/scheduler/dbapi/event_scheduler_impl_test.go b/flyteadmin/scheduler/dbapi/event_scheduler_impl_test.go index 045d419a48..635442aeba 100644 --- a/flyteadmin/scheduler/dbapi/event_scheduler_impl_test.go +++ b/flyteadmin/scheduler/dbapi/event_scheduler_impl_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/flyteorg/flyteadmin/pkg/async/schedule/interfaces" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - schedMocks "github.com/flyteorg/flyteadmin/scheduler/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/pkg/async/schedule/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + schedMocks "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteadmin/scheduler/executor/executor.go b/flyteadmin/scheduler/executor/executor.go index 1a0c2ec9c1..4b430ebd81 100644 --- a/flyteadmin/scheduler/executor/executor.go +++ b/flyteadmin/scheduler/executor/executor.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" ) //go:generate mockery -name Executor -output=mocks -case=underscore diff --git a/flyteadmin/scheduler/executor/executor_impl.go b/flyteadmin/scheduler/executor/executor_impl.go index cc1705b3a8..532a7de8b4 100644 --- a/flyteadmin/scheduler/executor/executor_impl.go +++ b/flyteadmin/scheduler/executor/executor_impl.go @@ -5,13 +5,13 @@ import ( "strings" "time" - "github.com/flyteorg/flyteadmin/scheduler/identifier" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/identifier" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "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/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" diff --git a/flyteadmin/scheduler/executor/executor_impl_test.go b/flyteadmin/scheduler/executor/executor_impl_test.go index c84a6d5278..3606fa515f 100644 --- a/flyteadmin/scheduler/executor/executor_impl_test.go +++ b/flyteadmin/scheduler/executor/executor_impl_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" adminMocks "github.com/flyteorg/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flyteadmin/scheduler/executor/mocks/executor.go b/flyteadmin/scheduler/executor/mocks/executor.go index a8723b6f92..ade26acbec 100644 --- a/flyteadmin/scheduler/executor/mocks/executor.go +++ b/flyteadmin/scheduler/executor/mocks/executor.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + models "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" time "time" ) diff --git a/flyteadmin/scheduler/identifier/identifier.go b/flyteadmin/scheduler/identifier/identifier.go index 7f6b9a2492..63c8d43c0b 100644 --- a/flyteadmin/scheduler/identifier/identifier.go +++ b/flyteadmin/scheduler/identifier/identifier.go @@ -8,9 +8,9 @@ import ( "strconv" "time" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" "github.com/google/uuid" ) diff --git a/flyteadmin/scheduler/repositories/gormimpl/metrics.go b/flyteadmin/scheduler/repositories/gormimpl/metrics.go index f00225b4b8..f54d632359 100644 --- a/flyteadmin/scheduler/repositories/gormimpl/metrics.go +++ b/flyteadmin/scheduler/repositories/gormimpl/metrics.go @@ -3,7 +3,7 @@ package gormimpl import ( "time" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) // Common metrics emitted by gormimpl repos. diff --git a/flyteadmin/scheduler/repositories/gormimpl/schedulable_entity_repo.go b/flyteadmin/scheduler/repositories/gormimpl/schedulable_entity_repo.go index 8251f6f7c4..741d4c19cf 100644 --- a/flyteadmin/scheduler/repositories/gormimpl/schedulable_entity_repo.go +++ b/flyteadmin/scheduler/repositories/gormimpl/schedulable_entity_repo.go @@ -6,11 +6,11 @@ import ( "errors" - adminErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + adminErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/flyteadmin/scheduler/repositories/gormimpl/schedule_entities_snapshot_repo.go b/flyteadmin/scheduler/repositories/gormimpl/schedule_entities_snapshot_repo.go index 9bce77c616..825b1cd3fd 100644 --- a/flyteadmin/scheduler/repositories/gormimpl/schedule_entities_snapshot_repo.go +++ b/flyteadmin/scheduler/repositories/gormimpl/schedule_entities_snapshot_repo.go @@ -4,10 +4,10 @@ import ( "context" "errors" - flyteSchedulerDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - interfaces2 "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + flyteSchedulerDbErrors "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + interfaces2 "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "gorm.io/gorm" ) diff --git a/flyteadmin/scheduler/repositories/interfaces/schedulable_entity_repo.go b/flyteadmin/scheduler/repositories/interfaces/schedulable_entity_repo.go index 57ae77f0c5..2b19767587 100644 --- a/flyteadmin/scheduler/repositories/interfaces/schedulable_entity_repo.go +++ b/flyteadmin/scheduler/repositories/interfaces/schedulable_entity_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" ) //go:generate mockery -name=SchedulableEntityRepoInterface -output=../mocks -case=underscore diff --git a/flyteadmin/scheduler/repositories/interfaces/schedule_entities_snapshot_repo.go b/flyteadmin/scheduler/repositories/interfaces/schedule_entities_snapshot_repo.go index 4efdcfe2e5..1d3d8891cb 100644 --- a/flyteadmin/scheduler/repositories/interfaces/schedule_entities_snapshot_repo.go +++ b/flyteadmin/scheduler/repositories/interfaces/schedule_entities_snapshot_repo.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" ) //go:generate mockery -name=ScheduleEntitiesSnapShotRepoInterface -output=../mocks -case=underscore diff --git a/flyteadmin/scheduler/repositories/mocks/schedulable_entity_repo_interface.go b/flyteadmin/scheduler/repositories/mocks/schedulable_entity_repo_interface.go index e8ab481fd1..c9dc1e7e56 100644 --- a/flyteadmin/scheduler/repositories/mocks/schedulable_entity_repo_interface.go +++ b/flyteadmin/scheduler/repositories/mocks/schedulable_entity_repo_interface.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + models "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" ) // SchedulableEntityRepoInterface is an autogenerated mock type for the SchedulableEntityRepoInterface type diff --git a/flyteadmin/scheduler/repositories/mocks/schedule_entities_snap_shot_repo_interface.go b/flyteadmin/scheduler/repositories/mocks/schedule_entities_snap_shot_repo_interface.go index 9e375deeae..1dcb6f083b 100644 --- a/flyteadmin/scheduler/repositories/mocks/schedule_entities_snap_shot_repo_interface.go +++ b/flyteadmin/scheduler/repositories/mocks/schedule_entities_snap_shot_repo_interface.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/flyteorg/flyteadmin/scheduler/repositories/models" + models "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" ) // ScheduleEntitiesSnapShotRepoInterface is an autogenerated mock type for the ScheduleEntitiesSnapShotRepoInterface type diff --git a/flyteadmin/scheduler/repositories/models/schedulable_entity.go b/flyteadmin/scheduler/repositories/models/schedulable_entity.go index 550a2292a4..1fa25a9311 100644 --- a/flyteadmin/scheduler/repositories/models/schedulable_entity.go +++ b/flyteadmin/scheduler/repositories/models/schedulable_entity.go @@ -1,7 +1,7 @@ package models import ( - "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" ) diff --git a/flyteadmin/scheduler/repositories/models/schedule_entities_snapshot.go b/flyteadmin/scheduler/repositories/models/schedule_entities_snapshot.go index 891d6ea7b3..f4a75199b4 100644 --- a/flyteadmin/scheduler/repositories/models/schedule_entities_snapshot.go +++ b/flyteadmin/scheduler/repositories/models/schedule_entities_snapshot.go @@ -1,6 +1,6 @@ package models -import "github.com/flyteorg/flyteadmin/pkg/repositories/models" +import "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" // Database model to save the snapshot for the schedulable entities in the db type ScheduleEntitiesSnapshot struct { diff --git a/flyteadmin/scheduler/schedule_executor.go b/flyteadmin/scheduler/schedule_executor.go index c8da9cf251..3eae856db4 100644 --- a/flyteadmin/scheduler/schedule_executor.go +++ b/flyteadmin/scheduler/schedule_executor.go @@ -4,16 +4,16 @@ import ( "context" "time" - repositoryInterfaces "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" - - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - "github.com/flyteorg/flyteadmin/scheduler/core" - "github.com/flyteorg/flyteadmin/scheduler/executor" - "github.com/flyteorg/flyteadmin/scheduler/snapshoter" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" + + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyte/flyteadmin/scheduler/core" + "github.com/flyteorg/flyte/flyteadmin/scheduler/executor" + "github.com/flyteorg/flyte/flyteadmin/scheduler/snapshoter" + "github.com/flyteorg/flyte/flytestdlib/futures" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/futures" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "golang.org/x/time/rate" "k8s.io/apimachinery/pkg/util/wait" diff --git a/flyteadmin/scheduler/schedule_executor_test.go b/flyteadmin/scheduler/schedule_executor_test.go index 02428d3eab..97436afcda 100644 --- a/flyteadmin/scheduler/schedule_executor_test.go +++ b/flyteadmin/scheduler/schedule_executor_test.go @@ -10,17 +10,17 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - adminModels "github.com/flyteorg/flyteadmin/pkg/repositories/models" - runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" - schedMocks "github.com/flyteorg/flyteadmin/scheduler/repositories/mocks" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flyteadmin/scheduler/snapshoter" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + adminModels "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + runtimeInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces" + schedMocks "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/snapshoter" - repositoryInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" adminMocks "github.com/flyteorg/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flyteadmin/scheduler/snapshoter/snapshoter.go b/flyteadmin/scheduler/snapshoter/snapshoter.go index ccd9825497..1aceb22883 100644 --- a/flyteadmin/scheduler/snapshoter/snapshoter.go +++ b/flyteadmin/scheduler/snapshoter/snapshoter.go @@ -5,12 +5,12 @@ import ( "context" "time" - repositoryInterfaces "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" - "github.com/flyteorg/flyteadmin/pkg/errors" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/errors" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" diff --git a/flyteadmin/scheduler/snapshoter/snapshoter_test.go b/flyteadmin/scheduler/snapshoter/snapshoter_test.go index 59f94460b2..512e4de682 100644 --- a/flyteadmin/scheduler/snapshoter/snapshoter_test.go +++ b/flyteadmin/scheduler/snapshoter/snapshoter_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" - adminModels "github.com/flyteorg/flyteadmin/pkg/repositories/models" - repositoryInterfaces "github.com/flyteorg/flyteadmin/scheduler/repositories/interfaces" - schedMocks "github.com/flyteorg/flyteadmin/scheduler/repositories/mocks" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/mocks" + adminModels "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + repositoryInterfaces "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/interfaces" + schedMocks "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/mocks" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/scheduler/start.go b/flyteadmin/scheduler/start.go index d93d09db8d..fce4de30b4 100644 --- a/flyteadmin/scheduler/start.go +++ b/flyteadmin/scheduler/start.go @@ -5,12 +5,12 @@ import ( "fmt" "runtime/debug" - "github.com/flyteorg/flyteadmin/pkg/repositories" - "github.com/flyteorg/flyteadmin/pkg/repositories/errors" - "github.com/flyteorg/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/errors" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/clients/go/admin" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" ) // StartScheduler creates and starts a new scheduler instance. This is a blocking call and will block the calling go-routine diff --git a/flyteadmin/tests/attributes_test.go b/flyteadmin/tests/attributes_test.go index f933fc84ca..1706d991d4 100644 --- a/flyteadmin/tests/attributes_test.go +++ b/flyteadmin/tests/attributes_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteadmin/pkg/repositories" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" "github.com/golang/protobuf/proto" diff --git a/flyteadmin/tests/bootstrap.go b/flyteadmin/tests/bootstrap.go index 11a9b7abab..0d33bd7924 100644 --- a/flyteadmin/tests/bootstrap.go +++ b/flyteadmin/tests/bootstrap.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/database" + "github.com/flyteorg/flyte/flytestdlib/database" - "github.com/flyteorg/flyteadmin/pkg/repositories" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" "gorm.io/gorm" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) const insertExecutionQueryStr = `INSERT INTO "executions" ` + diff --git a/flyteadmin/tests/execution_test.go b/flyteadmin/tests/execution_test.go index a8d5e9b828..be36d4c0d7 100644 --- a/flyteadmin/tests/execution_test.go +++ b/flyteadmin/tests/execution_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/flyteorg/flyteadmin/pkg/repositories" + "github.com/flyteorg/flyte/flyteadmin/pkg/repositories" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" diff --git a/flyteadmin/tests/scheduler_test.go b/flyteadmin/tests/scheduler_test.go index caa6081d00..6500c3efb4 100644 --- a/flyteadmin/tests/scheduler_test.go +++ b/flyteadmin/tests/scheduler_test.go @@ -14,14 +14,14 @@ import ( "github.com/stretchr/testify/mock" "golang.org/x/time/rate" - adminModels "github.com/flyteorg/flyteadmin/pkg/repositories/models" - "github.com/flyteorg/flyteadmin/pkg/runtime" - scheduler "github.com/flyteorg/flyteadmin/scheduler/core" - "github.com/flyteorg/flyteadmin/scheduler/executor/mocks" - "github.com/flyteorg/flyteadmin/scheduler/repositories/models" - "github.com/flyteorg/flyteadmin/scheduler/snapshoter" + adminModels "github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/pkg/runtime" + scheduler "github.com/flyteorg/flyte/flyteadmin/scheduler/core" + "github.com/flyteorg/flyte/flyteadmin/scheduler/executor/mocks" + "github.com/flyteorg/flyte/flyteadmin/scheduler/repositories/models" + "github.com/flyteorg/flyte/flyteadmin/scheduler/snapshoter" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) func TestScheduleJob(t *testing.T) { diff --git a/flyteadmin/tests/shared.go b/flyteadmin/tests/shared.go index 2dbaee3a4b..041889bf73 100644 --- a/flyteadmin/tests/shared.go +++ b/flyteadmin/tests/shared.go @@ -13,7 +13,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" "github.com/stretchr/testify/assert" diff --git a/flyteadmin/tests/task_execution_test.go b/flyteadmin/tests/task_execution_test.go index 508bc8ccd5..77871a1cb6 100644 --- a/flyteadmin/tests/task_execution_test.go +++ b/flyteadmin/tests/task_execution_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" - mockScope "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + mockScope "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/ptypes/timestamp" @@ -22,7 +22,7 @@ import ( "github.com/golang/protobuf/ptypes" ptypesStruct "github.com/golang/protobuf/ptypes/struct" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flyteadmin/tests/task_test.go b/flyteadmin/tests/task_test.go index a74454d972..158c5ace51 100644 --- a/flyteadmin/tests/task_test.go +++ b/flyteadmin/tests/task_test.go @@ -14,7 +14,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/golang/protobuf/proto" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/flyteadmin/tests/workflow_test.go b/flyteadmin/tests/workflow_test.go index c7dd8d70e4..2ccd77f6fe 100644 --- a/flyteadmin/tests/workflow_test.go +++ b/flyteadmin/tests/workflow_test.go @@ -10,7 +10,7 @@ import ( "net/http" "testing" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/testutils" + "github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/testutils" "github.com/golang/protobuf/proto" diff --git a/flytecopilot/boilerplate/flyte/golang_support_tools/tools.go b/flytecopilot/boilerplate/flyte/golang_support_tools/tools.go index 43de03450c..a78b61162a 100644 --- a/flytecopilot/boilerplate/flyte/golang_support_tools/tools.go +++ b/flytecopilot/boilerplate/flyte/golang_support_tools/tools.go @@ -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" ) diff --git a/flytecopilot/boilerplate/flyte/golang_test_targets/download_tooling.sh b/flytecopilot/boilerplate/flyte/golang_test_targets/download_tooling.sh index 003220ea70..47f0d0060f 100755 --- a/flytecopilot/boilerplate/flyte/golang_test_targets/download_tooling.sh +++ b/flytecopilot/boilerplate/flyte/golang_test_targets/download_tooling.sh @@ -17,8 +17,7 @@ set -e # In the format of ":" or ":" if no cli tools=( "github.com/EngHabu/mockery/cmd/mockery" - "github.com/flyteorg/flytestdlib/cli/pflags@latest" - "github.com/golangci/golangci-lint/cmd/golangci-lint@latest" + "github.com/golangci/golangci-lint/cmd/golangci-lint" "github.com/alvaroloes/enumer" "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc" ) diff --git a/flytecopilot/cmd/containerwatcher/file_watcher.go b/flytecopilot/cmd/containerwatcher/file_watcher.go index de83a928c5..b6d135912d 100644 --- a/flytecopilot/cmd/containerwatcher/file_watcher.go +++ b/flytecopilot/cmd/containerwatcher/file_watcher.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/fsnotify/fsnotify" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/sets" diff --git a/flytecopilot/cmd/containerwatcher/kubeapi_watcher.go b/flytecopilot/cmd/containerwatcher/kubeapi_watcher.go index c6857b7ea3..aa0b12e837 100644 --- a/flytecopilot/cmd/containerwatcher/kubeapi_watcher.go +++ b/flytecopilot/cmd/containerwatcher/kubeapi_watcher.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" v13 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" diff --git a/flytecopilot/cmd/containerwatcher/noop_watcher.go b/flytecopilot/cmd/containerwatcher/noop_watcher.go index 3644426a91..233bc8da85 100644 --- a/flytecopilot/cmd/containerwatcher/noop_watcher.go +++ b/flytecopilot/cmd/containerwatcher/noop_watcher.go @@ -3,7 +3,7 @@ package containerwatcher import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) type NoopWatcher struct { diff --git a/flytecopilot/cmd/containerwatcher/spns_watcher.go b/flytecopilot/cmd/containerwatcher/spns_watcher.go index aad610998e..81127b4a20 100644 --- a/flytecopilot/cmd/containerwatcher/spns_watcher.go +++ b/flytecopilot/cmd/containerwatcher/spns_watcher.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/mitchellh/go-ps" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/sets" diff --git a/flytecopilot/cmd/download.go b/flytecopilot/cmd/download.go index 8c30471c22..ac3bed7601 100644 --- a/flytecopilot/cmd/download.go +++ b/flytecopilot/cmd/download.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/flyteorg/flytecopilot/data" + "github.com/flyteorg/flyte/flytecopilot/data" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/spf13/cobra" ) diff --git a/flytecopilot/cmd/download_test.go b/flytecopilot/cmd/download_test.go index e2b8c140bd..55a4f2e204 100644 --- a/flytecopilot/cmd/download_test.go +++ b/flytecopilot/cmd/download_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/flyteorg/flyteidl/clients/go/coreutils" diff --git a/flytecopilot/cmd/root.go b/flytecopilot/cmd/root.go index 4df4e98290..0cdabd3e47 100644 --- a/flytecopilot/cmd/root.go +++ b/flytecopilot/cmd/root.go @@ -12,14 +12,14 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" - "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/flytestdlib/version" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" + "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" + "github.com/flyteorg/flyte/flytestdlib/version" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/flytecopilot/cmd/sidecar.go b/flytecopilot/cmd/sidecar.go index 299b5ebf0e..ee5852a6c4 100644 --- a/flytecopilot/cmd/sidecar.go +++ b/flytecopilot/cmd/sidecar.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/flyteorg/flytecopilot/cmd/containerwatcher" - "github.com/flyteorg/flytecopilot/data" + "github.com/flyteorg/flyte/flytecopilot/cmd/containerwatcher" + "github.com/flyteorg/flyte/flytecopilot/data" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/flytecopilot/cmd/sidecar_test.go b/flytecopilot/cmd/sidecar_test.go index 1eec8b9093..e316b81d12 100644 --- a/flytecopilot/cmd/sidecar_test.go +++ b/flytecopilot/cmd/sidecar_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytecopilot/cmd/containerwatcher" + "github.com/flyteorg/flyte/flytecopilot/cmd/containerwatcher" ) func TestUploadOptions_Upload(t *testing.T) { diff --git a/flytecopilot/data/common.go b/flytecopilot/data/common.go index 8f01792c18..8c1ece63d8 100644 --- a/flytecopilot/data/common.go +++ b/flytecopilot/data/common.go @@ -16,7 +16,7 @@ // TODO: Currently retries are not automatically handled. package data -import "github.com/flyteorg/flytestdlib/futures" +import "github.com/flyteorg/flyte/flytestdlib/futures" type VarMap map[string]interface{} type FutureMap map[string]futures.Future diff --git a/flytecopilot/data/download.go b/flytecopilot/data/download.go index 692bae02a0..ffcc85f3e5 100644 --- a/flytecopilot/data/download.go +++ b/flytecopilot/data/download.go @@ -14,9 +14,9 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/futures" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/futures" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/ghodss/yaml" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" diff --git a/flytecopilot/data/upload.go b/flytecopilot/data/upload.go index 34049c1124..3302eee899 100644 --- a/flytecopilot/data/upload.go +++ b/flytecopilot/data/upload.go @@ -11,9 +11,9 @@ import ( "reflect" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/futures" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/futures" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/pkg/errors" diff --git a/flytecopilot/data/upload_test.go b/flytecopilot/data/upload_test.go index 2e3c84ee8b..01ac14aed3 100644 --- a/flytecopilot/data/upload_test.go +++ b/flytecopilot/data/upload_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flytecopilot/data/utils.go b/flytecopilot/data/utils.go index e0af73a07c..aced6682cf 100644 --- a/flytecopilot/data/utils.go +++ b/flytecopilot/data/utils.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/pkg/errors" ) diff --git a/flytecopilot/data/utils_test.go b/flytecopilot/data/utils_test.go index 15e616186b..a219eda74f 100644 --- a/flytecopilot/data/utils_test.go +++ b/flytecopilot/data/utils_test.go @@ -8,9 +8,9 @@ import ( "path" "testing" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flytecopilot/go.mod b/flytecopilot/go.mod index 677cce3ef5..f5dae4a430 100644 --- a/flytecopilot/go.mod +++ b/flytecopilot/go.mod @@ -1,19 +1,19 @@ -module github.com/flyteorg/flytecopilot +module github.com/flyteorg/flyte/flytecopilot go 1.19 require ( github.com/aws/aws-sdk-go v1.44.2 - github.com/flyteorg/flyteidl v1.3.6 - github.com/flyteorg/flytestdlib v1.0.15 + github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyteidl v0.0.0-00010101000000-000000000000 github.com/fsnotify/fsnotify v1.5.1 github.com/ghodss/yaml v1.0.0 - github.com/golang/protobuf v1.5.2 + github.com/golang/protobuf v1.5.3 github.com/mitchellh/go-ps v1.0.0 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.4 k8s.io/api v0.20.4 k8s.io/apimachinery v0.20.4 k8s.io/client-go v0.20.4 @@ -21,10 +21,11 @@ require ( ) require ( - cloud.google.com/go v0.101.0 // indirect - cloud.google.com/go/compute v1.6.1 // indirect - cloud.google.com/go/iam v0.3.0 // indirect - cloud.google.com/go/storage v1.22.0 // indirect + cloud.google.com/go v0.110.0 // indirect + cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/iam v0.13.0 // indirect + cloud.google.com/go/storage v1.28.1 // indirect github.com/Azure/azure-sdk-for-go v63.4.0+incompatible // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 // indirect @@ -37,21 +38,22 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coocood/freecache v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.13.0 // indirect - github.com/flyteorg/stow v0.3.6 // indirect + github.com/flyteorg/stow v0.3.7 // indirect github.com/go-logr/logr v0.4.0 // indirect github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/go-cmp v0.5.8 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/googleapis/gax-go/v2 v2.3.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect + github.com/googleapis/gax-go/v2 v2.7.1 // indirect github.com/googleapis/gnostic v0.4.1 // indirect - github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect @@ -61,7 +63,7 @@ require ( github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/ncw/swift v1.0.53 // indirect @@ -73,31 +75,41 @@ require ( github.com/prometheus/common v0.32.1 // indirect github.com/prometheus/procfs v0.7.3 // indirect github.com/sirupsen/logrus v1.7.0 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.11.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect - golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect - golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect - golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect - google.golang.org/api v0.76.0 // indirect + golang.org/x/net v0.9.0 // indirect + golang.org/x/oauth2 v0.7.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/term v0.7.0 // indirect + golang.org/x/text v0.9.0 // indirect + golang.org/x/time v0.1.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/api v0.114.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 // indirect - google.golang.org/grpc v1.46.0 // indirect - google.golang.org/protobuf v1.28.0 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.56.1 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.5.0 // indirect k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) + +replace ( + github.com/flyteorg/flyte/datacatalog => ../datacatalog + github.com/flyteorg/flyte/flyteadmin => ../flyteadmin + github.com/flyteorg/flyte/flytecopilot => ../flytecopilot + github.com/flyteorg/flyte/flyteplugins => ../flyteplugins + github.com/flyteorg/flyte/flytepropeller => ../flytepropeller + github.com/flyteorg/flyte/flytestdlib => ../flytestdlib + github.com/flyteorg/flyteidl => ../flyteidl +) diff --git a/flytecopilot/go.sum b/flytecopilot/go.sum index b38e9c89ee..1be017af7a 100644 --- a/flytecopilot/go.sum +++ b/flytecopilot/go.sum @@ -17,36 +17,23 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= -cloud.google.com/go v0.101.0 h1:g+LL+JvpvdyGtcaD2xw2mSByE/6F9s471eJSoaysM84= -cloud.google.com/go v0.101.0/go.mod h1:hEiddgDb77jDQ+I80tURYNJEnuwPzFU8awCFFRLKjW0= +cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= +cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= -cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= -cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= -cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= -cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= +cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= -cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -57,8 +44,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8= -cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE= +cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= +cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -103,7 +90,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.44.2 h1:5VBk5r06bgxgRKVaUtm1/4NT/rtrnH2E4cnAYv5zgQc= github.com/aws/aws-sdk-go v1.44.2/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= @@ -115,8 +101,9 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -125,12 +112,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc= github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -149,20 +130,12 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 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.15 h1:kv9jDQmytbE84caY+pkZN8trJU2ouSAmESzpTEhfTt0= -github.com/flyteorg/flytestdlib v1.0.15/go.mod h1:ghw/cjY0sEWIIbyCtcJnL/Gt7ZS7gf9SUi0CCPhbz3s= -github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk= -github.com/flyteorg/stow v0.3.6/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo= +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= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -217,8 +190,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -234,10 +205,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -251,10 +221,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -262,9 +230,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= -github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -275,29 +241,21 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= +github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= -github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI= -github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= +github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= -github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -354,8 +312,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -410,7 +368,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -421,8 +378,8 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= @@ -437,30 +394,33 @@ github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUs github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -498,7 +458,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -509,7 +468,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -546,19 +504,12 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -568,17 +519,9 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -589,7 +532,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -634,55 +576,37 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= -golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= +golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= +golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -734,17 +658,12 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= -golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -764,25 +683,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= -google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= -google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= -google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= -google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= -google.golang.org/api v0.76.0 h1:UkZl25bR1FHNqtK/EKs3vCdpZtUO6gea3YElTwc8pQg= -google.golang.org/api v0.76.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= +google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -814,7 +716,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -827,47 +728,9 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= -google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 h1:G1IeWbjrqEq9ChWxEuRPJu6laA67+XgTFHVSAvepr38= -google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -881,24 +744,11 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= -google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -911,14 +761,13 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= @@ -928,7 +777,6 @@ gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -936,8 +784,8 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/flytecopilot/main.go b/flytecopilot/main.go index 18c876e871..f6b46d4f7a 100644 --- a/flytecopilot/main.go +++ b/flytecopilot/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/flyteorg/flytecopilot/cmd" + "github.com/flyteorg/flyte/flytecopilot/cmd" ) func main() { diff --git a/flyteidl/boilerplate/flyte/golang_support_tools/tools.go b/flyteidl/boilerplate/flyte/golang_support_tools/tools.go index 43de03450c..a78b61162a 100644 --- a/flyteidl/boilerplate/flyte/golang_support_tools/tools.go +++ b/flyteidl/boilerplate/flyte/golang_support_tools/tools.go @@ -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" ) diff --git a/flyteidl/clients/go/admin/atomic_credentials.go b/flyteidl/clients/go/admin/atomic_credentials.go index ca2a4f1776..da603b4a15 100644 --- a/flyteidl/clients/go/admin/atomic_credentials.go +++ b/flyteidl/clients/go/admin/atomic_credentials.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc/credentials" - stdlibAtomic "github.com/flyteorg/flytestdlib/atomic" + stdlibAtomic "github.com/flyteorg/flyte/flytestdlib/atomic" ) // atomicPerRPCCredentials provides a convenience on top of atomic.Value and credentials.PerRPCCredentials to be thread-safe. diff --git a/flyteidl/clients/go/admin/auth_interceptor.go b/flyteidl/clients/go/admin/auth_interceptor.go index 3403267847..a12640b27c 100644 --- a/flyteidl/clients/go/admin/auth_interceptor.go +++ b/flyteidl/clients/go/admin/auth_interceptor.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/cache" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/logger" "golang.org/x/oauth2" "google.golang.org/grpc/codes" diff --git a/flyteidl/clients/go/admin/auth_interceptor_test.go b/flyteidl/clients/go/admin/auth_interceptor_test.go index d5e07a7131..dd6212bb81 100644 --- a/flyteidl/clients/go/admin/auth_interceptor_test.go +++ b/flyteidl/clients/go/admin/auth_interceptor_test.go @@ -20,11 +20,11 @@ import ( "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/util/rand" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/cache/mocks" adminMocks "github.com/flyteorg/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" ) // authMetadataServer is a fake AuthMetadataServer that takes in an AuthMetadataServer implementation (usually one diff --git a/flyteidl/clients/go/admin/client.go b/flyteidl/clients/go/admin/client.go index 05979ef7ab..7e111de11a 100644 --- a/flyteidl/clients/go/admin/client.go +++ b/flyteidl/clients/go/admin/client.go @@ -13,10 +13,10 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/health/grpc_health_v1" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/cache" "github.com/flyteorg/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/logger" ) // IDE "Go Generate File". This will create a mocks/AdminServiceClient.go file diff --git a/flyteidl/clients/go/admin/client_test.go b/flyteidl/clients/go/admin/client_test.go index 592dd2e2f6..69789402a8 100644 --- a/flyteidl/clients/go/admin/client_test.go +++ b/flyteidl/clients/go/admin/client_test.go @@ -18,6 +18,8 @@ import ( "golang.org/x/oauth2" _ "google.golang.org/grpc/balancer/roundrobin" //nolint + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/cache" cachemocks "github.com/flyteorg/flyteidl/clients/go/admin/cache/mocks" "github.com/flyteorg/flyteidl/clients/go/admin/mocks" @@ -25,8 +27,6 @@ import ( "github.com/flyteorg/flyteidl/clients/go/admin/pkce" "github.com/flyteorg/flyteidl/clients/go/admin/tokenorchestrator" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" ) func TestInitializeAndGetAdminClient(t *testing.T) { diff --git a/flyteidl/clients/go/admin/config.go b/flyteidl/clients/go/admin/config.go index e6c5ad06df..d0bdb38d8c 100644 --- a/flyteidl/clients/go/admin/config.go +++ b/flyteidl/clients/go/admin/config.go @@ -8,10 +8,10 @@ import ( "path/filepath" "time" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/deviceflow" "github.com/flyteorg/flyteidl/clients/go/admin/pkce" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteidl/clients/go/admin/deviceflow/config.go b/flyteidl/clients/go/admin/deviceflow/config.go index 4699cd6996..7532145623 100644 --- a/flyteidl/clients/go/admin/deviceflow/config.go +++ b/flyteidl/clients/go/admin/deviceflow/config.go @@ -1,6 +1,6 @@ package deviceflow -import "github.com/flyteorg/flytestdlib/config" +import "github.com/flyteorg/flyte/flytestdlib/config" // Config defines settings used for Device orchestration flow. type Config struct { diff --git a/flyteidl/clients/go/admin/deviceflow/token_orchestrator.go b/flyteidl/clients/go/admin/deviceflow/token_orchestrator.go index c187d586d1..a459b820e5 100644 --- a/flyteidl/clients/go/admin/deviceflow/token_orchestrator.go +++ b/flyteidl/clients/go/admin/deviceflow/token_orchestrator.go @@ -13,8 +13,8 @@ import ( "golang.org/x/net/context/ctxhttp" "golang.org/x/oauth2" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/tokenorchestrator" - "github.com/flyteorg/flytestdlib/logger" ) const ( diff --git a/flyteidl/clients/go/admin/deviceflow/token_orchestrator_test.go b/flyteidl/clients/go/admin/deviceflow/token_orchestrator_test.go index 7f6debdfdf..88b2d38bd6 100644 --- a/flyteidl/clients/go/admin/deviceflow/token_orchestrator_test.go +++ b/flyteidl/clients/go/admin/deviceflow/token_orchestrator_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/util/json" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/stretchr/testify/assert" "golang.org/x/oauth2" diff --git a/flyteidl/clients/go/admin/integration_test.go b/flyteidl/clients/go/admin/integration_test.go index 366f086f27..75c462b8eb 100644 --- a/flyteidl/clients/go/admin/integration_test.go +++ b/flyteidl/clients/go/admin/integration_test.go @@ -15,7 +15,7 @@ import ( "golang.org/x/oauth2/clientcredentials" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/stretchr/testify/assert" ) diff --git a/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go b/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go index e2eee411da..12e5470244 100644 --- a/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go +++ b/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/browser" "golang.org/x/oauth2" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/tokenorchestrator" - "github.com/flyteorg/flytestdlib/logger" ) const ( diff --git a/flyteidl/clients/go/admin/pkce/config.go b/flyteidl/clients/go/admin/pkce/config.go index 320afa0a44..7fec3d58a3 100644 --- a/flyteidl/clients/go/admin/pkce/config.go +++ b/flyteidl/clients/go/admin/pkce/config.go @@ -1,6 +1,6 @@ package pkce -import "github.com/flyteorg/flytestdlib/config" +import "github.com/flyteorg/flyte/flytestdlib/config" // Config defines settings used for PKCE flow. type Config struct { diff --git a/flyteidl/clients/go/admin/token_source_provider.go b/flyteidl/clients/go/admin/token_source_provider.go index e836bf81a6..8ed6388856 100644 --- a/flyteidl/clients/go/admin/token_source_provider.go +++ b/flyteidl/clients/go/admin/token_source_provider.go @@ -12,13 +12,13 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/clientcredentials" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/cache" "github.com/flyteorg/flyteidl/clients/go/admin/deviceflow" "github.com/flyteorg/flyteidl/clients/go/admin/externalprocess" "github.com/flyteorg/flyteidl/clients/go/admin/pkce" "github.com/flyteorg/flyteidl/clients/go/admin/tokenorchestrator" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/logger" ) //go:generate mockery -name TokenSource diff --git a/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator.go b/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator.go index 1136435da5..60196002ed 100644 --- a/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator.go +++ b/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator.go @@ -9,10 +9,10 @@ import ( "golang.org/x/oauth2" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/clients/go/admin/cache" "github.com/flyteorg/flyteidl/clients/go/admin/oauth" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" ) // BaseTokenOrchestrator implements the main logic to initiate device authorization flow diff --git a/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator_test.go b/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator_test.go index 38669a723b..c68d2db6a3 100644 --- a/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator_test.go +++ b/flyteidl/clients/go/admin/tokenorchestrator/base_token_orchestrator_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/mock" "golang.org/x/oauth2" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/flyteorg/flyteidl/clients/go/admin/cache" cacheMocks "github.com/flyteorg/flyteidl/clients/go/admin/cache/mocks" "github.com/flyteorg/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyteidl/clients/go/admin/oauth" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/config" ) func TestRefreshTheToken(t *testing.T) { diff --git a/flyteidl/clients/go/coreutils/literals.go b/flyteidl/clients/go/coreutils/literals.go index dde34bcc38..48448dd4a0 100644 --- a/flyteidl/clients/go/coreutils/literals.go +++ b/flyteidl/clients/go/coreutils/literals.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/ptypes" diff --git a/flyteidl/clients/go/coreutils/literals_test.go b/flyteidl/clients/go/coreutils/literals_test.go index 61910ac52d..751f776ab3 100644 --- a/flyteidl/clients/go/coreutils/literals_test.go +++ b/flyteidl/clients/go/coreutils/literals_test.go @@ -12,8 +12,8 @@ import ( "github.com/go-test/deep" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/ptypes" structpb "github.com/golang/protobuf/ptypes/struct" diff --git a/flyteidl/go.mod b/flyteidl/go.mod index 3aacab7964..49543699a9 100644 --- a/flyteidl/go.mod +++ b/flyteidl/go.mod @@ -4,82 +4,84 @@ go 1.19 require ( github.com/antihax/optional v1.0.0 - github.com/flyteorg/flytestdlib v1.0.0 + github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000 github.com/go-test/deep v1.0.7 - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b - github.com/golang/protobuf v1.4.3 + github.com/golang/protobuf v1.5.3 github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/jinzhu/copier v0.3.5 - github.com/mitchellh/mapstructure v1.4.1 + github.com/mitchellh/mapstructure v1.5.0 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.0 - golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f - golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013 - google.golang.org/api v0.38.0 - google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 - google.golang.org/grpc v1.35.0 + github.com/stretchr/testify v1.8.4 + golang.org/x/net v0.9.0 + golang.org/x/oauth2 v0.7.0 + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 + google.golang.org/grpc v1.56.1 k8s.io/apimachinery v0.20.2 ) require ( - cloud.google.com/go v0.75.0 // indirect - cloud.google.com/go/storage v1.12.0 // indirect - github.com/Azure/azure-sdk-for-go v62.3.0+incompatible // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 // indirect - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 // indirect + cloud.google.com/go v0.110.0 // indirect + cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/iam v0.13.0 // indirect + cloud.google.com/go/storage v1.28.1 // indirect + github.com/Azure/azure-sdk-for-go v63.4.0+incompatible // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 // indirect + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.17 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.10 // indirect + github.com/Azure/go-autorest/autorest v0.11.27 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect - github.com/Azure/go-autorest/logger v0.2.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/aws/aws-sdk-go v1.37.1 // indirect + github.com/aws/aws-sdk-go v1.44.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coocood/freecache v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fatih/color v1.10.0 // indirect - github.com/flyteorg/stow v0.3.3 // indirect - github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/flyteorg/stow v0.3.7 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-logr/logr v0.4.0 // indirect github.com/gofrs/uuid v4.2.0+incompatible // indirect - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect - github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/golang-jwt/jwt/v4 v4.4.1 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect + github.com/googleapis/gax-go/v2 v2.7.1 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/jstemmer/go-junit-report v0.9.1 // indirect - github.com/mattn/go-colorable v0.1.8 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/ncw/swift v1.0.53 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.9.0 // indirect + github.com/prometheus/client_golang v1.12.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.15.0 // indirect - github.com/prometheus/procfs v0.3.0 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect github.com/sirupsen/logrus v1.7.0 // indirect - github.com/spf13/cobra v1.1.1 // indirect - github.com/stretchr/objx v0.3.0 // indirect - go.opencensus.io v0.22.6 // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect - golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect - golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect - golang.org/x/tools v0.1.10 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + github.com/spf13/cobra v1.4.0 // indirect + github.com/stretchr/objx v0.5.0 // indirect + go.opencensus.io v0.24.0 // indirect + golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.9.0 // indirect + golang.org/x/time v0.1.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/api v0.114.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.25.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/client-go v0.0.0-20210217172142-7279fc64d847 // indirect k8s.io/klog/v2 v2.5.0 // indirect ) @@ -89,3 +91,12 @@ retract ( v1.4.2 v1.4.0 ) + +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 +) diff --git a/flyteidl/go.sum b/flyteidl/go.sum index b2eab61f10..27fadc80a3 100644 --- a/flyteidl/go.sum +++ b/flyteidl/go.sum @@ -13,20 +13,23 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.66.0/go.mod h1:dgqGAjKCDxyhGTtC9dAREQGUJpkceNm1yt590Qno0Ko= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0 h1:XgtDnVJRCPEUG21gjFiRPz4zI1Mjg16R+NYQjfmU4XY= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= +cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= +cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -36,46 +39,45 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.12.0 h1:4y3gHptW1EHVtcPAVE0eBBlFuGqEejTTG3KdIE0lUX4= -cloud.google.com/go/storage v1.12.0/go.mod h1:fFLk2dp2oAhDz8QFKwqrjdJvxSp/W2g7nillojlL5Ho= +cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= +cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-sdk-for-go v62.3.0+incompatible h1:Ctfsn9UoA/BB4HMYQlbPPgNXdX0tZ4tmb85+KFb2+RE= -github.com/Azure/azure-sdk-for-go v62.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 h1:qoVeMsc9/fh/yhxVaA0obYjVH/oI/ihrOoMwsLS9KSA= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= +github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo= +github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 h1:3CVsSo4mp8NDWO11tHzN/mdo2zP0CtaSK5IcwBjfqRA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0 h1:NVS/4LOQfkBpk+B1VopIzv1ptmYeEskA8w/3K/w7vjo= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 h1:Px2KVERcYEg2Lv25AqC2hVr0xUWaq94wuEObLIkYzmA= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2/go.mod h1:CdSJQNNzZhCkwDaV27XV1w48ZBPtxe7mlrZAsPNxD5g= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 h1:0nJeKDmB7a1a8RDMjTltahlPsaNlWjq/LpkZleSwINk= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0/go.mod h1:mbwxKc/fW+IkF0GG591MuXw0KuEQBDkeRoZ9vmVJPxg= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest v0.11.17 h1:2zCdHwNgRH+St1J+ZMf66xI8aLr/5KMy+wWLH97zwYM= -github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= +github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= +github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.10 h1:r6fZHMaHD8B6LDCn0o5vyBFHIHrM6Ywwx7mb49lPItI= -github.com/Azure/go-autorest/autorest/adal v0.9.10/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= +github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ= +github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= +github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= -github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -83,91 +85,48 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.37.1 h1:BTHmuN+gzhxkvU9sac2tZvaY0gV9ihbHw+KxZOecYvY= -github.com/aws/aws-sdk-go v1.37.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aws/aws-sdk-go v1.44.2 h1:5VBk5r06bgxgRKVaUtm1/4NT/rtrnH2E4cnAYv5zgQc= +github.com/aws/aws-sdk-go v1.44.2/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc= github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= -github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= -github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/flyteorg/flytestdlib v1.0.0 h1:gb99ignMsVcNTUmWzArtcIDdkRjyzQQVBkWNOQakiFg= -github.com/flyteorg/flytestdlib v1.0.0/go.mod h1:QSVN5wIM1lM9d60eAEbX7NwweQXW96t5x4jbyftn89c= -github.com/flyteorg/stow v0.3.3 h1:tzeNl8mSZFL3oJDi0ACZj6FAineQAF4qyEp6bXtIdQY= -github.com/flyteorg/stow v0.3.3/go.mod h1:HBld7ud0i4khMHwJjkO8v+NSP7ddKa/ruhf4I8fliaA= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +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= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -178,7 +137,7 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= @@ -193,26 +152,26 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= +github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ= +github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -233,9 +192,11 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -247,15 +208,16 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -263,83 +225,46 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= +github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= +github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -355,216 +280,130 @@ github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks= github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU= -github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM= -github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.3.0 h1:Uehi/mxLK0eiUc0H0++5tpMGTexB8wZ598MIgU8VpDM= -github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= -github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.22.6 h1:BdkrbWrzDlV9dnbzoP7sfN+dHheJ4J9JOaYxcUDL+ok= -go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -587,8 +426,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -597,18 +434,11 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -619,7 +449,6 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -635,27 +464,23 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013 h1:55H5j7lotzuFCEOKDsMch+fRNUQ9DgtyHOUP31FNqKc= -golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -666,14 +491,10 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -684,12 +505,10 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -708,18 +527,21 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -727,17 +549,16 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= +golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -745,7 +566,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -756,9 +576,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -766,7 +583,6 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -786,24 +602,13 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -820,14 +625,9 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo= -google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.38.0 h1:vDyWk6eup8eQAidaZ31sNWIn8tZEL8qpbtGkBD4ytQo= -google.golang.org/api v0.38.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= +google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= @@ -840,7 +640,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -866,26 +665,12 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 h1:uLBY0yHDCj2PMQ98KWDSIDFwn9zK2zh+tgWtbvPPBjI= -google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -894,13 +679,10 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -910,24 +692,21 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= 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/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -938,9 +717,8 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -968,4 +746,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/flyteplugins/boilerplate/flyte/golang_support_tools/tools.go b/flyteplugins/boilerplate/flyte/golang_support_tools/tools.go index 43de03450c..a78b61162a 100644 --- a/flyteplugins/boilerplate/flyte/golang_support_tools/tools.go +++ b/flyteplugins/boilerplate/flyte/golang_support_tools/tools.go @@ -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" ) diff --git a/flyteplugins/go.mod b/flyteplugins/go.mod index aaefc2ca3b..14aba6796f 100644 --- a/flyteplugins/go.mod +++ b/flyteplugins/go.mod @@ -1,4 +1,4 @@ -module github.com/flyteorg/flyteplugins +module github.com/flyteorg/flyte/flyteplugins go 1.19 @@ -12,8 +12,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/athena v1.0.0 github.com/coocood/freecache v1.1.1 github.com/dask/dask-kubernetes/v2023 v2023.0.0-20230626103304-abd02cd17b26 - github.com/flyteorg/flyteidl v1.5.13 - github.com/flyteorg/flytestdlib v1.0.15 + github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyteidl v0.0.0-00010101000000-000000000000 github.com/go-test/deep v1.0.7 github.com/golang/protobuf v1.5.3 github.com/hashicorp/golang-lru v0.5.4 @@ -21,17 +21,17 @@ require ( github.com/kubeflow/common v0.4.3 github.com/kubeflow/training-operator v1.5.0-rc.0 github.com/magiconair/properties v1.8.6 - github.com/mitchellh/mapstructure v1.4.3 + github.com/mitchellh/mapstructure v1.5.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.1 - golang.org/x/net v0.8.0 - golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 - google.golang.org/api v0.76.0 - google.golang.org/grpc v1.46.0 - google.golang.org/protobuf v1.28.1 + github.com/stretchr/testify v1.8.4 + golang.org/x/net v0.9.0 + golang.org/x/oauth2 v0.7.0 + google.golang.org/api v0.114.0 + google.golang.org/grpc v1.56.1 + google.golang.org/protobuf v1.30.0 gotest.tools v2.2.0+incompatible k8s.io/api v0.24.1 k8s.io/apimachinery v0.24.1 @@ -41,10 +41,11 @@ require ( ) require ( - cloud.google.com/go v0.101.0 // indirect - cloud.google.com/go/compute v1.6.1 // indirect - cloud.google.com/go/iam v0.3.0 // indirect - cloud.google.com/go/storage v1.22.0 // indirect + cloud.google.com/go v0.110.0 // indirect + cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/iam v0.13.0 // indirect + cloud.google.com/go/storage v1.28.1 // indirect github.com/Azure/azure-sdk-for-go v63.4.0+incompatible // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 // indirect @@ -64,12 +65,12 @@ require ( github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect - github.com/flyteorg/stow v0.3.6 // indirect + github.com/flyteorg/stow v0.3.7 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-logr/logr v1.2.3 // indirect @@ -84,8 +85,8 @@ require ( github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/gax-go/v2 v2.3.0 // indirect - github.com/googleapis/go-type-adapters v1.0.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect + github.com/googleapis/gax-go/v2 v2.7.1 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect @@ -107,22 +108,22 @@ require ( github.com/prometheus/common v0.32.1 // indirect github.com/prometheus/procfs v0.7.3 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/cobra v1.4.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.11.0 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/term v0.7.0 // indirect + golang.org/x/text v0.9.0 // indirect + golang.org/x/time v0.1.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -134,4 +135,12 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d +replace ( + github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d + 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 +) diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum index b83d5c84a6..b47b530091 100644 --- a/flyteplugins/go.sum +++ b/flyteplugins/go.sum @@ -20,33 +20,23 @@ cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPT cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= -cloud.google.com/go v0.101.0 h1:g+LL+JvpvdyGtcaD2xw2mSByE/6F9s471eJSoaysM84= -cloud.google.com/go v0.101.0/go.mod h1:hEiddgDb77jDQ+I80tURYNJEnuwPzFU8awCFFRLKjW0= +cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= +cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= -cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= -cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= -cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= -cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= +cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= -cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -57,8 +47,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8= -cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE= +cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= +cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -161,8 +151,9 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -171,12 +162,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc= github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY= @@ -218,10 +203,6 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -232,12 +213,8 @@ github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= 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.5.13 h1:IQ2Cw+u36ew3BPyRDAcHdzc/GyNEOXOxhKy9jbS4hbo= -github.com/flyteorg/flyteidl v1.5.13/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flytestdlib v1.0.15 h1:kv9jDQmytbE84caY+pkZN8trJU2ouSAmESzpTEhfTt0= -github.com/flyteorg/flytestdlib v1.0.15/go.mod h1:ghw/cjY0sEWIIbyCtcJnL/Gt7ZS7gf9SUi0CCPhbz3s= -github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk= -github.com/flyteorg/stow v0.3.6/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo= +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= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -352,7 +329,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -373,7 +349,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= @@ -390,8 +365,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -402,9 +375,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= -github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -417,27 +388,21 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= +github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= -github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI= -github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= +github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= -github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= -github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -535,8 +500,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= @@ -628,8 +593,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -663,8 +628,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -690,9 +656,9 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -748,7 +714,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -808,15 +773,11 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -829,14 +790,9 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -911,31 +867,19 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= +golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -946,14 +890,15 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= +golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1013,17 +958,12 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= @@ -1049,23 +989,8 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= -google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= -google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= -google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= -google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= -google.golang.org/api v0.76.0 h1:UkZl25bR1FHNqtK/EKs3vCdpZtUO6gea3YElTwc8pQg= -google.golang.org/api v0.76.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= +google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1116,42 +1041,9 @@ google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= -google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 h1:G1IeWbjrqEq9ChWxEuRPJu6laA67+XgTFHVSAvepr38= -google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1172,18 +1064,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= -google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1197,9 +1079,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= diff --git a/flyteplugins/go/tasks/aws/client.go b/flyteplugins/go/tasks/aws/client.go index fe72127402..cc0d606c9a 100644 --- a/flyteplugins/go/tasks/aws/client.go +++ b/flyteplugins/go/tasks/aws/client.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" "context" @@ -18,7 +18,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/flyteplugins/go/tasks/aws/config.go b/flyteplugins/go/tasks/aws/config.go index f3e55455fd..9f614bef29 100644 --- a/flyteplugins/go/tasks/aws/config.go +++ b/flyteplugins/go/tasks/aws/config.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/retry" awsConfig "github.com/aws/aws-sdk-go-v2/config" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" ) //go:generate pflags Config --default-var defaultConfig diff --git a/flyteplugins/go/tasks/config/config.go b/flyteplugins/go/tasks/config/config.go old mode 100755 new mode 100644 index 0cb5c6b92f..1588090b87 --- a/flyteplugins/go/tasks/config/config.go +++ b/flyteplugins/go/tasks/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) const configSectionKey = "plugins" diff --git a/flyteplugins/go/tasks/config_load_test.go b/flyteplugins/go/tasks/config_load_test.go old mode 100755 new mode 100644 index 7ece0eae55..e181c817b4 --- a/flyteplugins/go/tasks/config_load_test.go +++ b/flyteplugins/go/tasks/config_load_test.go @@ -8,12 +8,12 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - flyteK8sConfig "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - sagemakerConfig "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/spark" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + flyteK8sConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + sagemakerConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/spark" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" ) func TestLoadConfig(t *testing.T) { diff --git a/flyteplugins/go/tasks/errors/errors.go b/flyteplugins/go/tasks/errors/errors.go old mode 100755 new mode 100644 index 5560bb32f8..47af0ca9f6 --- a/flyteplugins/go/tasks/errors/errors.go +++ b/flyteplugins/go/tasks/errors/errors.go @@ -1,7 +1,7 @@ package errors import ( - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" ) const ( diff --git a/flyteplugins/go/tasks/logs/config.go b/flyteplugins/go/tasks/logs/config.go old mode 100755 new mode 100644 index a1af825902..205aa08f76 --- a/flyteplugins/go/tasks/logs/config.go +++ b/flyteplugins/go/tasks/logs/config.go @@ -1,9 +1,9 @@ package logs import ( + "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" ) //go:generate pflags LogConfig --default-var=DefaultConfig diff --git a/flyteplugins/go/tasks/logs/logging_utils.go b/flyteplugins/go/tasks/logs/logging_utils.go old mode 100755 new mode 100644 index 741ed2d29c..394ccb31b1 --- a/flyteplugins/go/tasks/logs/logging_utils.go +++ b/flyteplugins/go/tasks/logs/logging_utils.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" v1 "k8s.io/api/core/v1" ) diff --git a/flyteplugins/go/tasks/logs/logging_utils_test.go b/flyteplugins/go/tasks/logs/logging_utils_test.go old mode 100755 new mode 100644 index ab44ed2137..ebd8cec5bb --- a/flyteplugins/go/tasks/logs/logging_utils_test.go +++ b/flyteplugins/go/tasks/logs/logging_utils_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" "github.com/go-test/deep" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast.go b/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast.go index c7a7960f69..04ba00528d 100644 --- a/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast.go +++ b/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/flyteorg/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" - pluginMachinery "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" + pluginMachinery "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) const failFastExecutorName = "fail-fast" diff --git a/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast_test.go b/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast_test.go index f6df58439a..52f1d76d80 100644 --- a/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/bundle/fail_fast_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/mock" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/async_client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/async_client.go index ce44801531..91470f7994 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/async_client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/async_client.go @@ -3,11 +3,11 @@ package catalog import ( "context" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) type ResponseStatus uint8 diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl.go b/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl.go index 886e0fabc4..abddeb0fac 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl.go @@ -7,11 +7,11 @@ import ( "hash/fnv" "reflect" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" ) const specialEncoderKey = "abcdefghijklmnopqrstuvwxyz123456" diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl_test.go b/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl_test.go index 4255a97a41..73ff306037 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/async_client_impl_test.go @@ -5,11 +5,11 @@ import ( "reflect" "testing" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks" + "github.com/flyteorg/flyte/flytestdlib/bitarray" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks" - "github.com/flyteorg/flytestdlib/bitarray" "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/client.go index 7531a59d93..7dba7fb920 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/client.go @@ -11,7 +11,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) //go:generate mockery -all -case=underscore diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/client_test.go b/flyteplugins/go/tasks/pluginmachinery/catalog/client_test.go index aecc41d4fc..58fe8d5be4 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/client_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/client_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" ) var ( diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/config.go b/flyteplugins/go/tasks/pluginmachinery/catalog/config.go index 7e0607049f..9b29923740 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/config.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/config.go @@ -1,8 +1,8 @@ package catalog import ( - "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/hashing.go b/flyteplugins/go/tasks/pluginmachinery/catalog/hashing.go index 95d6b0e419..05693257d0 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/hashing.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/hashing.go @@ -4,8 +4,8 @@ import ( "context" "encoding/base64" + "github.com/flyteorg/flyte/flytestdlib/pbhash" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/pbhash" ) var emptyLiteralMap = core.LiteralMap{Literals: map[string]*core.Literal{}} diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/async_client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/async_client.go index 242d01f851..57b5fc824f 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/async_client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/async_client.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go index fe9d75f1cc..30c296013d 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" datacatalog "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_future.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_future.go index b7a068498f..0e2a9dc324 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_future.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_future.go @@ -3,7 +3,7 @@ package mocks import ( - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_response.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_response.go index 5a9d6c9076..6a005acf0c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_response.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/download_response.go @@ -3,7 +3,7 @@ package mocks import ( - bitarray "github.com/flyteorg/flytestdlib/bitarray" + bitarray "github.com/flyteorg/flyte/flytestdlib/bitarray" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/future.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/future.go index e62b17d664..0f7b5c3dc6 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/future.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/future.go @@ -3,7 +3,7 @@ package mocks import ( - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/upload_future.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/upload_future.go index b9a254d6a1..d7e20206bc 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/upload_future.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/upload_future.go @@ -3,7 +3,7 @@ package mocks import ( - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/reader_processor.go b/flyteplugins/go/tasks/pluginmachinery/catalog/reader_processor.go index bd999050a1..07e1c15028 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/reader_processor.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/reader_processor.go @@ -7,13 +7,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" ) type ReaderWorkItem struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/response.go b/flyteplugins/go/tasks/pluginmachinery/catalog/response.go index 20bcebe0bb..9cb0eb81fb 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/response.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/response.go @@ -1,8 +1,8 @@ package catalog import ( - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/errors" ) type future struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/writer_processor.go b/flyteplugins/go/tasks/pluginmachinery/catalog/writer_processor.go index 03b925e5ac..c0037b333b 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/writer_processor.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/writer_processor.go @@ -5,12 +5,12 @@ import ( "fmt" "reflect" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" ) type WriterWorkItem struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/core/exec_context.go b/flyteplugins/go/tasks/pluginmachinery/core/exec_context.go index e724c601ab..86f3d7aad1 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/exec_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/exec_context.go @@ -3,10 +3,10 @@ package core import ( "context" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytestdlib/storage" ) // An interface to access a remote/sharable location that contains the serialized TaskTemplate diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/events_recorder.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/events_recorder.go index 8f846198c3..ed3982cbb7 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/events_recorder.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/events_recorder.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/plugin.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/plugin.go index 813cdaa3ad..944515076e 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/plugin.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_manager.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_manager.go index 0ef3c67353..0ccdff0073 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_manager.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_manager.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_negotiator.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_negotiator.go index c0e2e9b184..7dabb9c13b 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_negotiator.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_negotiator.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_registrar.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_registrar.go index 101f255ba1..5e6dcc3574 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_registrar.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/resource_registrar.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/setup_context.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/setup_context.go index d1a647426c..9922067bf0 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/setup_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/setup_context.go @@ -3,10 +3,10 @@ package mocks import ( - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" - promutils "github.com/flyteorg/flytestdlib/promutils" + promutils "github.com/flyteorg/flyte/flytestdlib/promutils" ) // SetupContext is an autogenerated mock type for the SetupContext type diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_context.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_context.go index c7ff4961c8..ec4b5e346f 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_context.go @@ -3,14 +3,14 @@ package mocks import ( - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // TaskExecutionContext is an autogenerated mock type for the TaskExecutionContext type diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_metadata.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_metadata.go index 29f0055dc8..15ae31791a 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_metadata.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_execution_metadata.go @@ -3,7 +3,7 @@ package mocks import ( - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" corev1 "k8s.io/api/core/v1" flyteidlcore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_reader.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_reader.go index ab95a40200..7ec2cd2089 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_reader.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // TaskReader is an autogenerated mock type for the TaskReader type diff --git a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_template_path.go b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_template_path.go index 2d445b552d..c3e3a35641 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_template_path.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/mocks/task_template_path.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // TaskTemplatePath is an autogenerated mock type for the TaskTemplatePath type diff --git a/flyteplugins/go/tasks/pluginmachinery/core/plugin_test.go b/flyteplugins/go/tasks/pluginmachinery/core/plugin_test.go index ea299a6aac..d2538f4032 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/plugin_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/plugin_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" "gotest.tools/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/setup_context.go b/flyteplugins/go/tasks/pluginmachinery/core/setup_context.go index a513b70023..bb24159681 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/setup_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/setup_context.go @@ -1,7 +1,7 @@ package core import ( - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/apimachinery/pkg/types" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/template/template.go b/flyteplugins/go/tasks/pluginmachinery/core/template/template.go index c0d00b6f05..b9706bb3a8 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/template/template.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/template/template.go @@ -25,10 +25,10 @@ import ( "regexp" "strings" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flytestdlib/logger" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytestdlib/logger" "github.com/golang/protobuf/ptypes" "github.com/pkg/errors" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/core/template/template_test.go b/flyteplugins/go/tasks/pluginmachinery/core/template/template_test.go index 3f1f8460ae..0c390617d5 100644 --- a/flyteplugins/go/tasks/pluginmachinery/core/template/template_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/core/template/template_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - pluginsCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + pluginsCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/config/config.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/config/config.go old mode 100755 new mode 100644 index 057b2fe145..a624f7831c --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/config/config.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/config/config.go @@ -10,10 +10,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" - config2 "github.com/flyteorg/flytestdlib/config" + config2 "github.com/flyteorg/flyte/flytestdlib/config" v1 "k8s.io/api/core/v1" - "github.com/flyteorg/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" ) //go:generate pflags K8sPluginConfig --default-var=defaultK8sConfig diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper.go old mode 100755 new mode 100644 index 6bc9e80f43..dbba1f3b68 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper.go @@ -3,12 +3,12 @@ package flytek8s import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginscore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginscore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go old mode 100755 new mode 100644 index be575d48cd..ddc916acb0 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot.go index ac8358d33c..d8c3e24657 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot.go @@ -6,17 +6,17 @@ import ( "fmt" "time" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - core2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + core2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) const ( diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot_test.go index 587a29ac4f..bc25668dd1 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/copilot_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" + config2 "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - config2 "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" @@ -17,9 +17,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - pluginsCoreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - pluginsIOMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + pluginsCoreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + pluginsIOMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" ) var resourceRequirements = &v1.ResourceRequirements{ diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go old mode 100755 new mode 100644 index 49efef455c..645e9e2233 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go @@ -5,14 +5,14 @@ import ( "os" "strconv" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) func GetContextEnvVars(ownerCtx context.Context) []v1.EnvVar { diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go old mode 100755 new mode 100644 index 866b042056..11dc5a00c9 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go @@ -6,15 +6,15 @@ import ( "reflect" "testing" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" v12 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" ) func TestGetExecutionEnvVars(t *testing.T) { diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go old mode 100755 new mode 100644 index 661527c1d8..ea8a47be93 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go @@ -9,13 +9,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginserrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginserrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/imdario/mergo" diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go old mode 100755 new mode 100644 index 3acb1ab18f..50c9d0eb49 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go @@ -11,15 +11,15 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginsCoreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - pluginsIOMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - - config1 "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" - "github.com/flyteorg/flytestdlib/storage" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCoreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + pluginsIOMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + + config1 "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_template_store.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_template_store.go index cb79feee1c..9c8c1d25af 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_template_store.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_template_store.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils.go old mode 100755 new mode 100644 index fa0e7591a0..e9acef14fb --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils.go @@ -1,8 +1,8 @@ package flytek8s import ( + pluginmachinery_core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginmachinery_core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils_test.go old mode 100755 new mode 100644 index 42ba9b037b..54d30ad2d2 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/utils_test.go @@ -3,8 +3,8 @@ package flytek8s import ( "testing" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/flyteplugins/go/tasks/pluginmachinery/google/gke_task_workload_identity_token_source_factory.go b/flyteplugins/go/tasks/pluginmachinery/google/gke_task_workload_identity_token_source_factory.go index 649401fe1b..0a136edfef 100644 --- a/flyteplugins/go/tasks/pluginmachinery/google/gke_task_workload_identity_token_source_factory.go +++ b/flyteplugins/go/tasks/pluginmachinery/google/gke_task_workload_identity_token_source_factory.go @@ -3,7 +3,7 @@ package google import ( "context" - pluginmachinery "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + pluginmachinery "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" "github.com/pkg/errors" "golang.org/x/oauth2" "google.golang.org/api/impersonate" diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token.go index 7b4f159f03..d31f5a0955 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token.go @@ -6,11 +6,11 @@ import ( "k8s.io/utils/clock" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) type tokenAllocator struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token_test.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token_test.go index 24faf33822..18fe498e20 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/allocation_token_test.go @@ -7,21 +7,21 @@ import ( "github.com/stretchr/testify/mock" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" "github.com/stretchr/testify/assert" testing2 "k8s.io/utils/clock/testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/go-test/deep" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) func init() { diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache.go index 856e2104b3..dfa4f38473 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache.go @@ -3,19 +3,19 @@ package webapi import ( "context" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/client-go/util/workqueue" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - stdErrors "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) //go:generate mockery -all -case=underscore diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache_test.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache_test.go index 49506b530e..e6f8b28e08 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/cache_test.go @@ -5,16 +5,16 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/promutils" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks" - "github.com/flyteorg/flytestdlib/cache" - cacheMocks "github.com/flyteorg/flytestdlib/cache/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks" + "github.com/flyteorg/flyte/flytestdlib/cache" + cacheMocks "github.com/flyteorg/flyte/flytestdlib/cache/mocks" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go index 049fc431aa..91a171bbec 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go @@ -8,15 +8,15 @@ import ( "k8s.io/utils/clock" - stdErrs "github.com/flyteorg/flytestdlib/errors" + stdErrs "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) const ( diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core_test.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core_test.go index 2888090f6f..d7db79495c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/config" ) func Test_validateConfig(t *testing.T) { diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher.go index 83debfe9b4..3ee99b2f4b 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/flyteorg/flytestdlib/cache" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) func launch(ctx context.Context, p webapi.AsyncPlugin, tCtx core.TaskExecutionContext, cache cache.AutoRefresh, diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher_test.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher_test.go index 726f7c9341..40f9999ff8 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/launcher_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - mocks2 "github.com/flyteorg/flytestdlib/cache/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + mocks2 "github.com/flyteorg/flyte/flytestdlib/cache/mocks" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/metrics.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/metrics.go index d5f767a582..b014f8df76 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/metrics.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/metrics.go @@ -3,8 +3,8 @@ package webapi import ( "time" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks/client.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks/client.go index 19d91ad79e..22445662ca 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks/client.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" - webapi "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + webapi "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) // Client is an autogenerated mock type for the Client type diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor.go index 6d3d4ac33d..42896ada4f 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor.go @@ -3,11 +3,11 @@ package webapi import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flytestdlib/cache" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) func monitor(ctx context.Context, tCtx core.TaskExecutionContext, p Client, cache cache.AutoRefresh, state *State) ( diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor_test.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor_test.go index 0842f87d6f..96a5a15e0d 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/monitor_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/cache" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/util/workqueue" - core2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/stretchr/testify/mock" @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - internalMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + internalMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/internal/webapi/mocks" ) func Test_monitor(t *testing.T) { diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/plugin_context.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/plugin_context.go index 0a883d3dd5..a92dbd50aa 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/plugin_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/plugin_context.go @@ -1,7 +1,7 @@ package webapi import ( - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) type pluginContext struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/state.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/state.go index 130c1affcb..03a6b89053 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/state.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/state.go @@ -3,7 +3,7 @@ package webapi import ( "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) //go:generate enumer -type=Phase -trimprefix=Phase diff --git a/flyteplugins/go/tasks/pluginmachinery/io/iface.go b/flyteplugins/go/tasks/pluginmachinery/io/iface.go index 15d5adefc5..4e5cd87116 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/iface.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/iface.go @@ -3,8 +3,8 @@ package io import ( "context" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" ) //go:generate mockery -all -case=underscore diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/checkpoint_paths.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/checkpoint_paths.go index 5d7c25f3a7..afcf71a571 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/checkpoint_paths.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/checkpoint_paths.go @@ -3,7 +3,7 @@ package mocks import ( - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_file_paths.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_file_paths.go index 0a3a3d9e34..c1bbddeb62 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_file_paths.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_file_paths.go @@ -3,7 +3,7 @@ package mocks import ( - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_reader.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_reader.go index f53b15472e..b2079f9da1 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/input_reader.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // InputReader is an autogenerated mock type for the InputReader type diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_data_sandbox.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_data_sandbox.go index e9f5488d4b..ad26fb90cb 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_data_sandbox.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_data_sandbox.go @@ -3,7 +3,7 @@ package mocks import ( - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_file_paths.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_file_paths.go index d1018c8f07..773cd74f20 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_file_paths.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_file_paths.go @@ -3,7 +3,7 @@ package mocks import ( - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_reader.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_reader.go index ed7e671e29..285a79dad9 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_reader.go @@ -6,7 +6,7 @@ import ( context "context" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_writer.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_writer.go index 038681623f..8fcca1cb92 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_writer.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/output_writer.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // OutputWriter is an autogenerated mock type for the OutputWriter type diff --git a/flyteplugins/go/tasks/pluginmachinery/io/mocks/raw_output_paths.go b/flyteplugins/go/tasks/pluginmachinery/io/mocks/raw_output_paths.go index b444e2a281..9b5c75d59c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/io/mocks/raw_output_paths.go +++ b/flyteplugins/go/tasks/pluginmachinery/io/mocks/raw_output_paths.go @@ -3,7 +3,7 @@ package mocks import ( - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/buffered_output_writer.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/buffered_output_writer.go index e5d3c16100..38642b25b1 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/buffered_output_writer.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/buffered_output_writer.go @@ -3,7 +3,7 @@ package ioutils import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) // A Buffered outputWriter just records the io.OutputReader and can be accessed using special methods. diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/cached_input_reader.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/cached_input_reader.go index df797808b8..f9f5430733 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/cached_input_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/cached_input_reader.go @@ -5,7 +5,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) type cachedInputReader struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader.go index 7dd10698d4..67243b317e 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" ) type InMemoryOutputReader struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader_test.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader_test.go index 3cae110fd9..04c530d12f 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/in_memory_output_reader_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flytestdlib/storage" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go index e50aa5484f..eb7224800a 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go @@ -3,9 +3,9 @@ package ioutils import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" ) const ( diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/paths_test.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/paths_test.go index 02bb629070..1b768578d4 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/paths_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/paths_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path.go index 6a8de9f510..6246ed65dd 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path.go @@ -6,10 +6,10 @@ import ( "encoding/hex" "strconv" + "github.com/flyteorg/flyte/flytestdlib/storage" core2 "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) type precomputedRawOutputPaths struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path_test.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path_test.go index 87059805f3..1e11642506 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/raw_output_path_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flytestdlib/storage" core2 "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader.go index 1f57019cb5..bbaf032f24 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader.go @@ -3,12 +3,12 @@ package ioutils import ( "context" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) const ( diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader_test.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader_test.go index c9c24d4123..e20e0e18c0 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_input_reader_test.go @@ -3,7 +3,7 @@ package ioutils import ( "testing" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader.go index 35bd4fd1af..3c546029cc 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader.go @@ -6,10 +6,10 @@ import ( "github.com/pkg/errors" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) type RemoteFileOutputReader struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader_test.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader_test.go index ee10638b46..7391a518ee 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_reader_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" + pluginsIOMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + storageMocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsIOMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - storageMocks "github.com/flyteorg/flytestdlib/storage/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) @@ -16,6 +16,7 @@ import ( type MemoryMetadata struct { exists bool size int64 + etag string } func (m MemoryMetadata) Size() int64 { @@ -26,6 +27,10 @@ func (m MemoryMetadata) Exists() bool { return m.exists } +func (m MemoryMetadata) Etag() string { + return m.etag +} + func TestReadOrigin(t *testing.T) { ctx := context.TODO() diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer.go index d60d0c2b65..bbb1021268 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer.go @@ -6,8 +6,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flytestdlib/storage" ) var ( diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer_test.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer_test.go index ecca892fcc..0d58a46cc2 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/remote_file_output_writer_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader.go index a65d1a3df7..bd77ca56ff 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader.go @@ -5,9 +5,9 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/atomic" - "github.com/flyteorg/flytestdlib/storage" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/atomic" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/pkg/errors" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader_test.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader_test.go index d4463519b5..234a870c0f 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/task_reader_test.go @@ -5,12 +5,12 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "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/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/client.go b/flyteplugins/go/tasks/pluginmachinery/k8s/client.go index 8335036c57..fa6ec67d21 100644 --- a/flyteplugins/go/tasks/pluginmachinery/k8s/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/k8s/client.go @@ -5,7 +5,7 @@ package k8s import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/client-go/rest" diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/client_builder.go b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/client_builder.go index 95fc27e39d..4312ab348d 100644 --- a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/client_builder.go +++ b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/client_builder.go @@ -6,7 +6,7 @@ import ( cache "sigs.k8s.io/controller-runtime/pkg/cache" client "sigs.k8s.io/controller-runtime/pkg/client" - k8s "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + k8s "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" mock "github.com/stretchr/testify/mock" diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin.go b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin.go index 16849663d3..872f8f3653 100644 --- a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin.go @@ -7,9 +7,9 @@ import ( client "sigs.k8s.io/controller-runtime/pkg/client" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - k8s "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + k8s "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_abort_override.go b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_abort_override.go index c2223edcbe..1433252a9e 100644 --- a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_abort_override.go +++ b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_abort_override.go @@ -7,9 +7,9 @@ import ( client "sigs.k8s.io/controller-runtime/pkg/client" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - k8s "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + k8s "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_context.go b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_context.go index e77ab3920c..532b5fe76c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/k8s/mocks/plugin_context.go @@ -3,12 +3,12 @@ package mocks import ( - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // PluginContext is an autogenerated mock type for the PluginContext type diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/plugin.go b/flyteplugins/go/tasks/pluginmachinery/k8s/plugin.go index d8d99ee82b..0bb3774dcd 100644 --- a/flyteplugins/go/tasks/pluginmachinery/k8s/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/k8s/plugin.go @@ -5,11 +5,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) //go:generate mockery -all -case=underscore diff --git a/flyteplugins/go/tasks/pluginmachinery/registry.go b/flyteplugins/go/tasks/pluginmachinery/registry.go index 633c8a676f..b792ce80ce 100644 --- a/flyteplugins/go/tasks/pluginmachinery/registry.go +++ b/flyteplugins/go/tasks/pluginmachinery/registry.go @@ -4,13 +4,13 @@ import ( "context" "sync" - internalRemote "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/internal/webapi" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + internalRemote "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/internal/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" ) type taskPluginRegistry struct { diff --git a/flyteplugins/go/tasks/pluginmachinery/utils/dns.go b/flyteplugins/go/tasks/pluginmachinery/utils/dns.go index d76a1e7771..5f5a911ccf 100644 --- a/flyteplugins/go/tasks/pluginmachinery/utils/dns.go +++ b/flyteplugins/go/tasks/pluginmachinery/utils/dns.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" "k8s.io/apimachinery/pkg/util/validation" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/utils/secrets/marshaler.go b/flyteplugins/go/tasks/pluginmachinery/utils/secrets/marshaler.go index 18e99ab253..197bc27ed4 100644 --- a/flyteplugins/go/tasks/pluginmachinery/utils/secrets/marshaler.go +++ b/flyteplugins/go/tasks/pluginmachinery/utils/secrets/marshaler.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" "github.com/golang/protobuf/proto" diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/example/config.go b/flyteplugins/go/tasks/pluginmachinery/webapi/example/config.go index f9502887ea..6f101e09b0 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/example/config.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/example/config.go @@ -3,10 +3,10 @@ package example import ( "time" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/example/config_test.go b/flyteplugins/go/tasks/pluginmachinery/webapi/example/config_test.go index a408a1b288..ffd462d76c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/example/config_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/example/config_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "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/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/example/plugin.go b/flyteplugins/go/tasks/pluginmachinery/webapi/example/plugin.go index 128bb6dde4..5062696145 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/example/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/example/plugin.go @@ -6,12 +6,12 @@ import ( idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) const ( diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/async_plugin.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/async_plugin.go index 50376b7d01..ac976107ba 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/async_plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/async_plugin.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" - webapi "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + webapi "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) // AsyncPlugin is an autogenerated mock type for the AsyncPlugin type diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/plugin_setup_context.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/plugin_setup_context.go index 06013e55a6..c5e3415672 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/plugin_setup_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/plugin_setup_context.go @@ -3,7 +3,7 @@ package mocks import ( - promutils "github.com/flyteorg/flytestdlib/promutils" + promutils "github.com/flyteorg/flyte/flytestdlib/promutils" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/resource.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/resource.go index 96a7bf558b..a5eefa9f89 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/resource.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/resource.go @@ -3,7 +3,7 @@ package mocks import ( - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/status_context.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/status_context.go index 5e3510a0ba..f9d1239185 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/status_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/status_context.go @@ -3,12 +3,12 @@ package mocks import ( - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // StatusContext is an autogenerated mock type for the StatusContext type diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/sync_plugin.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/sync_plugin.go index eaa35e42cd..cfe5d38090 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/sync_plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/sync_plugin.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" mock "github.com/stretchr/testify/mock" - webapi "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + webapi "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) // SyncPlugin is an autogenerated mock type for the SyncPlugin type diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context.go index 62714cb2dc..602c34114b 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context.go @@ -3,12 +3,12 @@ package mocks import ( - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // TaskExecutionContext is an autogenerated mock type for the TaskExecutionContext type diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context_reader.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context_reader.go index 72c1bdc363..10a04eb10b 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context_reader.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context_reader.go @@ -3,8 +3,8 @@ package mocks import ( - core "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go index 63b6b5e2b6..f6d9906594 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go @@ -10,12 +10,12 @@ package webapi import ( "context" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" ) //go:generate mockery -all -case=underscore diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/pluginconfig.go b/flyteplugins/go/tasks/pluginmachinery/webapi/pluginconfig.go index d2032334e8..67220e7083 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/pluginconfig.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/pluginconfig.go @@ -3,8 +3,8 @@ package webapi import ( "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags PluginConfig --default-var=DefaultPluginConfig diff --git a/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/indexed_work_queue.go b/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/indexed_work_queue.go index d0ef3a6e16..dd0c3acb5b 100644 --- a/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/indexed_work_queue.go +++ b/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/indexed_work_queue.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - workqueue "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + workqueue "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/processor.go b/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/processor.go index 42bd29ac1f..ec5c0d12a6 100644 --- a/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/processor.go +++ b/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/processor.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - workqueue "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + workqueue "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/work_item_info.go b/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/work_item_info.go index 71f99f64aa..b4e0202fb7 100644 --- a/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/work_item_info.go +++ b/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks/work_item_info.go @@ -3,7 +3,7 @@ package mocks import ( - workqueue "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + workqueue "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/pluginmachinery/workqueue/queue.go b/flyteplugins/go/tasks/pluginmachinery/workqueue/queue.go index f17a1706bf..09d75bc493 100644 --- a/flyteplugins/go/tasks/pluginmachinery/workqueue/queue.go +++ b/flyteplugins/go/tasks/pluginmachinery/workqueue/queue.go @@ -5,14 +5,14 @@ import ( "fmt" "sync" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" lru "github.com/hashicorp/golang-lru" diff --git a/flyteplugins/go/tasks/pluginmachinery/workqueue/queue_test.go b/flyteplugins/go/tasks/pluginmachinery/workqueue/queue_test.go index 8ec77243b8..76fd52f775 100644 --- a/flyteplugins/go/tasks/pluginmachinery/workqueue/queue_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/workqueue/queue_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "github.com/go-test/deep" lru "github.com/hashicorp/golang-lru" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type singleStatusProcessor struct { diff --git a/flyteplugins/go/tasks/plugins/array/array_tests_base.go b/flyteplugins/go/tasks/plugins/array/array_tests_base.go index dd8551bc01..b8e5c561ed 100644 --- a/flyteplugins/go/tasks/plugins/array/array_tests_base.go +++ b/flyteplugins/go/tasks/plugins/array/array_tests_base.go @@ -3,14 +3,14 @@ package array import ( "testing" - "github.com/flyteorg/flyteplugins/tests" + "github.com/flyteorg/flyte/flyteplugins/tests" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyte/flytestdlib/utils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flytestdlib/utils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "context" diff --git a/flyteplugins/go/tasks/plugins/array/arraystatus/status.go b/flyteplugins/go/tasks/plugins/array/arraystatus/status.go index e74b952a1c..ff30e0e44f 100644 --- a/flyteplugins/go/tasks/plugins/array/arraystatus/status.go +++ b/flyteplugins/go/tasks/plugins/array/arraystatus/status.go @@ -8,8 +8,8 @@ import ( "encoding/binary" "hash/fnv" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/bitarray" ) type JobID = string diff --git a/flyteplugins/go/tasks/plugins/array/arraystatus/status_test.go b/flyteplugins/go/tasks/plugins/array/arraystatus/status_test.go index d45496d58d..6b17f2c81c 100644 --- a/flyteplugins/go/tasks/plugins/array/arraystatus/status_test.go +++ b/flyteplugins/go/tasks/plugins/array/arraystatus/status_test.go @@ -7,9 +7,9 @@ package arraystatus import ( "testing" - types "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + types "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/bitarray" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/client.go b/flyteplugins/go/tasks/plugins/array/awsbatch/client.go index b76d4bb2b7..74ad8617c4 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/client.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/client.go @@ -12,10 +12,10 @@ import ( a "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/batch" - "github.com/flyteorg/flyteplugins/go/tasks/aws" - definition2 "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/definition" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/aws" + definition2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/definition" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/utils" ) //go:generate mockery -all -case=underscore diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/client_test.go b/flyteplugins/go/tasks/plugins/array/awsbatch/client_test.go index f4dd72fe6c..efef99643c 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/client_test.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/client_test.go @@ -7,14 +7,14 @@ package awsbatch import ( "context" - stdConfig "github.com/flyteorg/flytestdlib/config" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" + "github.com/flyteorg/flyte/flytestdlib/utils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "testing" diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/config/config.go b/flyteplugins/go/tasks/plugins/array/awsbatch/config/config.go index 6fd84d6ffe..7b8a484140 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/config/config.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/config/config.go @@ -3,9 +3,9 @@ package config import ( "time" - "github.com/flyteorg/flyteplugins/go/tasks/aws" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/aws" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var defaultConfig diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go b/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go index 181b130692..a1ca632b27 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go @@ -3,23 +3,23 @@ package awsbatch import ( "context" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/definition" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/definition" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" - batchConfig "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" + batchConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/utils" - "github.com/flyteorg/flyteplugins/go/tasks/aws" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/aws" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/executor_metrics.go b/flyteplugins/go/tasks/plugins/array/awsbatch/executor_metrics.go index 97befc6ce2..121b6e6bbd 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/executor_metrics.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/executor_metrics.go @@ -1,8 +1,8 @@ package awsbatch import ( - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) type ExecutorMetrics struct { diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/executor_test.go b/flyteplugins/go/tasks/plugins/array/awsbatch/executor_test.go index ccb257714e..9b481a83d6 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/executor_test.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/executor_test.go @@ -5,34 +5,34 @@ import ( "reflect" "testing" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" v1 "k8s.io/api/core/v1" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/apimachinery/pkg/types" - "github.com/flyteorg/flyteplugins/go/tasks/aws" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/aws" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - queueMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks" + pluginMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + queueMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" - batchConfig "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/definition" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" - cacheMocks "github.com/flyteorg/flytestdlib/cache/mocks" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" + batchConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/definition" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" + cacheMocks "github.com/flyteorg/flyte/flytestdlib/cache/mocks" + "github.com/flyteorg/flyte/flytestdlib/utils" ) func TestExecutor_Handle(t *testing.T) { diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition.go b/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition.go index 1998f521a9..897ebbcb95 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition.go @@ -4,16 +4,16 @@ import ( "context" "regexp" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" + awsUtils "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/awsutils" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" - awsUtils "github.com/flyteorg/flyteplugins/go/tasks/plugins/awsutils" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/definition" + + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/definition" ) const defaultComputeEngine = "EC2" diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition_test.go b/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition_test.go index 9ec77bc466..e373a1c70a 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition_test.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/job_definition_test.go @@ -8,12 +8,12 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/definition" - batchMocks "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/definition" + batchMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" + "github.com/flyteorg/flyte/flytestdlib/utils" "golang.org/x/net/context" "github.com/stretchr/testify/assert" diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go b/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go index ca061c5788..6c9a58303e 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go @@ -12,19 +12,19 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" "k8s.io/client-go/util/workqueue" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/logger" "k8s.io/apimachinery/pkg/types" "github.com/aws/aws-sdk-go/service/batch" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type JobName = string diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store_test.go b/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store_test.go index 56c079edde..cc3c258e38 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store_test.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store_test.go @@ -12,17 +12,17 @@ import ( "github.com/aws/aws-sdk-go/service/batch" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" - mocks3 "github.com/flyteorg/flytestdlib/cache/mocks" - "github.com/flyteorg/flytestdlib/utils" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" + mocks3 "github.com/flyteorg/flyte/flytestdlib/cache/mocks" + "github.com/flyteorg/flyte/flytestdlib/utils" - config2 "github.com/flyteorg/flytestdlib/config" + config2 "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/launcher.go b/flyteplugins/go/tasks/plugins/array/awsbatch/launcher.go index 55ee2454bf..10752d6f3c 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/launcher.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/launcher.go @@ -4,16 +4,16 @@ import ( "context" "fmt" - "github.com/flyteorg/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/logger" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" ) func LaunchSubTasks(ctx context.Context, tCtx core.TaskExecutionContext, batchClient Client, pluginConfig *config.Config, diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/launcher_test.go b/flyteplugins/go/tasks/plugins/array/awsbatch/launcher_test.go index a154f3d9d0..09fa16bcad 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/launcher_test.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/launcher_test.go @@ -3,33 +3,33 @@ package awsbatch import ( "testing" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/mock" "k8s.io/apimachinery/pkg/api/resource" - core3 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + core3 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" "github.com/go-test/deep" - mocks3 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + mocks3 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" v1 "k8s.io/api/core/v1" - core2 "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + core2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" + "github.com/flyteorg/flyte/flytestdlib/utils" "golang.org/x/net/context" ) diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/mocks/cache.go b/flyteplugins/go/tasks/plugins/array/awsbatch/mocks/cache.go index d37bed19f2..dbcf81b85e 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/mocks/cache.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/mocks/cache.go @@ -3,7 +3,7 @@ package mocks import ( - definition "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/definition" + definition "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/definition" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go b/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go index 7d99f9be39..0c575339f0 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go @@ -5,22 +5,22 @@ import ( core2 "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/bitarray" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/errorcollector" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/errorcollector" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) func createSubJobList(count int) []*Job { diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/monitor_test.go b/flyteplugins/go/tasks/plugins/array/awsbatch/monitor_test.go index a9d708377b..4c490d2a00 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/monitor_test.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/monitor_test.go @@ -5,32 +5,32 @@ import ( "github.com/stretchr/testify/mock" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" flyteIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/batch" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" - batchMocks "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" + batchMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/mocks" + "github.com/flyteorg/flyte/flytestdlib/utils" "github.com/stretchr/testify/assert" "golang.org/x/net/context" "k8s.io/apimachinery/pkg/types" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/bitarray" ) func init() { diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/state.go b/flyteplugins/go/tasks/plugins/array/awsbatch/state.go index b6d4d33959..a37e49eabd 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/state.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/state.go @@ -1,8 +1,8 @@ package awsbatch import ( - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/definition" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/definition" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" ) type State struct { diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/task_links.go b/flyteplugins/go/tasks/plugins/array/awsbatch/task_links.go index 9aeee1b391..5b585006ed 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/task_links.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/task_links.go @@ -3,15 +3,15 @@ package awsbatch import ( "fmt" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - errors2 "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flytestdlib/errors" + errors2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "golang.org/x/net/context" ) diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/transformer.go b/flyteplugins/go/tasks/plugins/array/awsbatch/transformer.go index e3cd7041f1..9b2897d157 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/transformer.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/transformer.go @@ -5,18 +5,18 @@ import ( "sort" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" "github.com/aws/aws-sdk-go/service/batch" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + config2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - config2 "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" "github.com/golang/protobuf/ptypes/duration" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/transformer_test.go b/flyteplugins/go/tasks/plugins/array/awsbatch/transformer_test.go index 68f0370276..ad8450395d 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/transformer_test.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/transformer_test.go @@ -14,16 +14,16 @@ import ( "k8s.io/apimachinery/pkg/api/resource" - flyteK8sConfig "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + flyteK8sConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch/config" v12 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flyteplugins/go/tasks/plugins/array/catalog.go b/flyteplugins/go/tasks/plugins/array/catalog.go index df57ac9ef2..e8ad56573e 100644 --- a/flyteplugins/go/tasks/plugins/array/catalog.go +++ b/flyteplugins/go/tasks/plugins/array/catalog.go @@ -9,17 +9,17 @@ import ( idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" idlPlugins "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" ) const AwsBatchTaskType = "aws-batch" diff --git a/flyteplugins/go/tasks/plugins/array/catalog_test.go b/flyteplugins/go/tasks/plugins/array/catalog_test.go index 454d23794d..44fe10219b 100644 --- a/flyteplugins/go/tasks/plugins/array/catalog_test.go +++ b/flyteplugins/go/tasks/plugins/array/catalog_test.go @@ -8,20 +8,20 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - catalogMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" - core2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" - - "github.com/flyteorg/flytestdlib/bitarray" - stdErrors "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + catalogMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" + core2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" + + "github.com/flyteorg/flyte/flytestdlib/bitarray" + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/go-test/deep" diff --git a/flyteplugins/go/tasks/plugins/array/core/metadata.go b/flyteplugins/go/tasks/plugins/array/core/metadata.go index ed85015719..ed3bc52a3e 100644 --- a/flyteplugins/go/tasks/plugins/array/core/metadata.go +++ b/flyteplugins/go/tasks/plugins/array/core/metadata.go @@ -5,8 +5,8 @@ import ( idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) // InitializeExternalResources constructs an ExternalResource array where each element describes the diff --git a/flyteplugins/go/tasks/plugins/array/core/metadata_test.go b/flyteplugins/go/tasks/plugins/array/core/metadata_test.go index 998e1181a5..c10ef9d134 100644 --- a/flyteplugins/go/tasks/plugins/array/core/metadata_test.go +++ b/flyteplugins/go/tasks/plugins/array/core/metadata_test.go @@ -6,10 +6,10 @@ import ( idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/bitarray" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/array/core/state.go b/flyteplugins/go/tasks/plugins/array/core/state.go index 517637a2f5..f5aecee577 100644 --- a/flyteplugins/go/tasks/plugins/array/core/state.go +++ b/flyteplugins/go/tasks/plugins/array/core/state.go @@ -5,16 +5,16 @@ import ( "fmt" "time" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flytestdlib/logger" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" idlPlugins "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytestdlib/logger" structpb "github.com/golang/protobuf/ptypes/struct" ) diff --git a/flyteplugins/go/tasks/plugins/array/core/state_test.go b/flyteplugins/go/tasks/plugins/array/core/state_test.go index 0f81498b9d..c6876d4f13 100644 --- a/flyteplugins/go/tasks/plugins/array/core/state_test.go +++ b/flyteplugins/go/tasks/plugins/array/core/state_test.go @@ -7,10 +7,10 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" "github.com/golang/protobuf/proto" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/bitarray" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/array/inputs.go b/flyteplugins/go/tasks/plugins/array/inputs.go index ac0c2acb5f..1322f8562b 100644 --- a/flyteplugins/go/tasks/plugins/array/inputs.go +++ b/flyteplugins/go/tasks/plugins/array/inputs.go @@ -3,10 +3,10 @@ package array import ( "context" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flytestdlib/storage" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytestdlib/storage" ) // arrayJobInputReader is a proxy inputreader that overrides the inputpath to be the inputpathprefix for array jobs diff --git a/flyteplugins/go/tasks/plugins/array/inputs_test.go b/flyteplugins/go/tasks/plugins/array/inputs_test.go index 42b0f8703e..e502b6559b 100644 --- a/flyteplugins/go/tasks/plugins/array/inputs_test.go +++ b/flyteplugins/go/tasks/plugins/array/inputs_test.go @@ -3,13 +3,13 @@ package array import ( "testing" + pluginsCoreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + pluginsIOMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCoreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - pluginsIOMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" ) func TestGetInputReader(t *testing.T) { diff --git a/flyteplugins/go/tasks/plugins/array/k8s/config.go b/flyteplugins/go/tasks/plugins/array/k8s/config.go index ad039b8a7d..c19cbb72a8 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/config.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/config.go @@ -8,15 +8,15 @@ import ( "fmt" "io/ioutil" - "github.com/flyteorg/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/plugins/array/k8s/executor.go b/flyteplugins/go/tasks/plugins/array/k8s/executor.go index 79da214f3e..172d0b65fd 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/executor.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/executor.go @@ -3,14 +3,14 @@ package k8s import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" - - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" + + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/flyteplugins/go/tasks/plugins/array/k8s/integration_test.go b/flyteplugins/go/tasks/plugins/array/k8s/integration_test.go index 1c1f8a9778..0e6f20b308 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/integration_test.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/integration_test.go @@ -7,16 +7,16 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" - - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" + + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" diff --git a/flyteplugins/go/tasks/plugins/array/k8s/management.go b/flyteplugins/go/tasks/plugins/array/k8s/management.go index 32a3970b4d..a46778c1f8 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/management.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/management.go @@ -7,19 +7,19 @@ import ( idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/errorcollector" - - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/errorcollector" + + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" ) // allocateResource attempts to allot resources for the specified parameter with the diff --git a/flyteplugins/go/tasks/plugins/array/k8s/management_test.go b/flyteplugins/go/tasks/plugins/array/k8s/management_test.go index 9c17331b40..0a69186c3c 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/management_test.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/management_test.go @@ -6,18 +6,18 @@ import ( core2 "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" - - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/storage" - stdmocks "github.com/flyteorg/flytestdlib/storage/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" + + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/storage" + stdmocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -34,6 +34,7 @@ import ( type metadata struct { exists bool size int64 + etag string } func (m metadata) Exists() bool { @@ -44,6 +45,10 @@ func (m metadata) Size() int64 { return m.size } +func (m metadata) Etag() string { + return m.etag +} + func createSampleContainerTask() *core2.Container { return &core2.Container{ Command: []string{"cmd"}, @@ -124,7 +129,7 @@ func getMockTaskExecutionContext(ctx context.Context, parallelism int) *mocks.Ta matchedBy := mock.MatchedBy(func(s storage.DataReference) bool { return true }) - composedProtobufStore.On("Head", mock.Anything, matchedBy).Return(metadata{true, 0}, nil) + composedProtobufStore.On("Head", mock.Anything, matchedBy).Return(metadata{true, 0, ""}, nil) dataStore := &storage.DataStore{ ComposedProtobufStore: composedProtobufStore, ReferenceConstructor: &storage.URLPathConstructor{}, diff --git a/flyteplugins/go/tasks/plugins/array/k8s/subtask.go b/flyteplugins/go/tasks/plugins/array/k8s/subtask.go index 150c9865ab..a62c275f0c 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/subtask.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/subtask.go @@ -8,17 +8,17 @@ import ( "strings" "time" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - podPlugin "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/pod" - - stdErrors "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + podPlugin "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/pod" + + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" v1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context.go b/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context.go index 646118698e..5b606eadd7 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context.go @@ -8,16 +8,16 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils/secrets" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array" - podPlugin "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/pod" - - "github.com/flyteorg/flytestdlib/storage" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils/secrets" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array" + podPlugin "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/pod" + + "github.com/flyteorg/flyte/flytestdlib/storage" ) // SubTaskExecutionContext wraps the core TaskExecutionContext so that the k8s array task context diff --git a/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context_test.go b/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context_test.go index 04b03b582b..ea0078db20 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context_test.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/subtask_exec_context_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" - podPlugin "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/pod" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" + podPlugin "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/pod" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/array/outputs.go b/flyteplugins/go/tasks/plugins/array/outputs.go index ed9b08f39f..964dcec3a6 100644 --- a/flyteplugins/go/tasks/plugins/array/outputs.go +++ b/flyteplugins/go/tasks/plugins/array/outputs.go @@ -4,22 +4,22 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/errorcollector" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/errorcollector" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" ) var ( diff --git a/flyteplugins/go/tasks/plugins/array/outputs_test.go b/flyteplugins/go/tasks/plugins/array/outputs_test.go index de46fd5fa7..d33fbd04ff 100644 --- a/flyteplugins/go/tasks/plugins/array/outputs_test.go +++ b/flyteplugins/go/tasks/plugins/array/outputs_test.go @@ -8,32 +8,32 @@ import ( "github.com/go-test/deep" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/arraystatus" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/arraystatus" - arrayCore "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/core" + arrayCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/core" - mocks3 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + mocks3 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/bitarray" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue/mocks" "github.com/stretchr/testify/mock" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" - "github.com/flyteorg/flytestdlib/promutils" ) func TestOutputAssembler_Queue(t *testing.T) { diff --git a/flyteplugins/go/tasks/plugins/array/subtask_phase.go b/flyteplugins/go/tasks/plugins/array/subtask_phase.go index 50569ee577..85ff403966 100644 --- a/flyteplugins/go/tasks/plugins/array/subtask_phase.go +++ b/flyteplugins/go/tasks/plugins/array/subtask_phase.go @@ -3,10 +3,10 @@ package array import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" ) const ( diff --git a/flyteplugins/go/tasks/plugins/awsutils/awsutils.go b/flyteplugins/go/tasks/plugins/awsutils/awsutils.go index 641b3e4280..555f7a75df 100644 --- a/flyteplugins/go/tasks/plugins/awsutils/awsutils.go +++ b/flyteplugins/go/tasks/plugins/awsutils/awsutils.go @@ -1,7 +1,7 @@ package awsutils import ( - core2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + core2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) func GetRoleFromSecurityContext(roleKey string, taskExecutionMetadata core2.TaskExecutionMetadata) string { diff --git a/flyteplugins/go/tasks/plugins/hive/client/mocks/qubole_client.go b/flyteplugins/go/tasks/plugins/hive/client/mocks/qubole_client.go index 61d33f2eb3..05350cd1bd 100644 --- a/flyteplugins/go/tasks/plugins/hive/client/mocks/qubole_client.go +++ b/flyteplugins/go/tasks/plugins/hive/client/mocks/qubole_client.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - client "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client" + client "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/plugins/hive/client/qubole_client.go b/flyteplugins/go/tasks/plugins/hive/client/qubole_client.go index a1a69b199f..e5d4664cfe 100644 --- a/flyteplugins/go/tasks/plugins/hive/client/qubole_client.go +++ b/flyteplugins/go/tasks/plugins/hive/client/qubole_client.go @@ -12,11 +12,11 @@ import ( "strconv" "time" - errors2 "github.com/flyteorg/flytestdlib/errors" + errors2 "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/config" ) const ( diff --git a/flyteplugins/go/tasks/plugins/hive/client/qubole_client_test.go b/flyteplugins/go/tasks/plugins/hive/client/qubole_client_test.go index 60016f2fb6..6f91095651 100644 --- a/flyteplugins/go/tasks/plugins/hive/client/qubole_client_test.go +++ b/flyteplugins/go/tasks/plugins/hive/client/qubole_client_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/config" ) var getCommandResponse = `{ diff --git a/flyteplugins/go/tasks/plugins/hive/client/qubole_status.go b/flyteplugins/go/tasks/plugins/hive/client/qubole_status.go index 62d155cd0e..5a6f26dc26 100644 --- a/flyteplugins/go/tasks/plugins/hive/client/qubole_status.go +++ b/flyteplugins/go/tasks/plugins/hive/client/qubole_status.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) // This type is meant only to encapsulate the response coming from Qubole as a type, it is diff --git a/flyteplugins/go/tasks/plugins/hive/config/config.go b/flyteplugins/go/tasks/plugins/hive/config/config.go index 9dff934a56..d098b627b1 100644 --- a/flyteplugins/go/tasks/plugins/hive/config/config.go +++ b/flyteplugins/go/tasks/plugins/hive/config/config.go @@ -6,10 +6,10 @@ import ( "context" "net/url" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" ) const quboleConfigSectionKey = "qubole" diff --git a/flyteplugins/go/tasks/plugins/hive/execution_state.go b/flyteplugins/go/tasks/plugins/hive/execution_state.go index d0f86f73d1..d2e7ea1065 100644 --- a/flyteplugins/go/tasks/plugins/hive/execution_state.go +++ b/flyteplugins/go/tasks/plugins/hive/execution_state.go @@ -6,23 +6,23 @@ import ( "strconv" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flytestdlib/cache" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/contextutils" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/config" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client" + "github.com/flyteorg/flyte/flytestdlib/logger" ) type ExecutionPhase int diff --git a/flyteplugins/go/tasks/plugins/hive/execution_state_test.go b/flyteplugins/go/tasks/plugins/hive/execution_state_test.go index 749e23b46b..a76ae65ef0 100644 --- a/flyteplugins/go/tasks/plugins/hive/execution_state_test.go +++ b/flyteplugins/go/tasks/plugins/hive/execution_state_test.go @@ -7,28 +7,28 @@ import ( "testing" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - ioMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + ioMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - mocks2 "github.com/flyteorg/flytestdlib/cache/mocks" + mocks2 "github.com/flyteorg/flyte/flytestdlib/cache/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - pluginsCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client" - quboleMocks "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + pluginsCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client" + quboleMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/config" ) func init() { diff --git a/flyteplugins/go/tasks/plugins/hive/executions_cache.go b/flyteplugins/go/tasks/plugins/hive/executions_cache.go index e80e723a8e..9efdaf95d8 100644 --- a/flyteplugins/go/tasks/plugins/hive/executions_cache.go +++ b/flyteplugins/go/tasks/plugins/hive/executions_cache.go @@ -6,17 +6,17 @@ import ( "k8s.io/client-go/util/workqueue" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - stdErrors "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) const ResyncDuration = 30 * time.Second diff --git a/flyteplugins/go/tasks/plugins/hive/executions_cache_test.go b/flyteplugins/go/tasks/plugins/hive/executions_cache_test.go index 20097498e3..3dfcf62385 100644 --- a/flyteplugins/go/tasks/plugins/hive/executions_cache_test.go +++ b/flyteplugins/go/tasks/plugins/hive/executions_cache_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/cache" - cacheMocks "github.com/flyteorg/flytestdlib/cache/mocks" + "github.com/flyteorg/flyte/flytestdlib/cache" + cacheMocks "github.com/flyteorg/flyte/flytestdlib/cache/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client" - quboleMocks "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client" + quboleMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/config" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/plugins/hive/executor.go b/flyteplugins/go/tasks/plugins/hive/executor.go index a07f7b5153..7be422281f 100644 --- a/flyteplugins/go/tasks/plugins/hive/executor.go +++ b/flyteplugins/go/tasks/plugins/hive/executor.go @@ -3,15 +3,15 @@ package hive import ( "context" - "github.com/flyteorg/flytestdlib/cache" - - "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginMachinery "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/client" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/cache" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginMachinery "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/client" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive/config" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) // This is the name of this plugin effectively. In Flyte plugin configuration, use this string to enable this plugin. diff --git a/flyteplugins/go/tasks/plugins/hive/executor_metrics.go b/flyteplugins/go/tasks/plugins/hive/executor_metrics.go index f2c5fccb63..7a0dbe9ed9 100644 --- a/flyteplugins/go/tasks/plugins/hive/executor_metrics.go +++ b/flyteplugins/go/tasks/plugins/hive/executor_metrics.go @@ -1,8 +1,8 @@ package hive import ( - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flyteplugins/go/tasks/plugins/hive/test_helpers.go b/flyteplugins/go/tasks/plugins/hive/test_helpers.go index 5d4ae14a22..771fecb75e 100644 --- a/flyteplugins/go/tasks/plugins/hive/test_helpers.go +++ b/flyteplugins/go/tasks/plugins/hive/test_helpers.go @@ -1,13 +1,13 @@ package hive import ( + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + coreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + ioMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flytestdlib/storage" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - coreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - ioMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytestdlib/storage" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/stretchr/testify/mock" v1 "k8s.io/api/core/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/dask/dask.go b/flyteplugins/go/tasks/plugins/k8s/dask/dask.go old mode 100755 new mode 100644 index f12423a64f..f21bd811d2 --- a/flyteplugins/go/tasks/plugins/k8s/dask/dask.go +++ b/flyteplugins/go/tasks/plugins/k8s/dask/dask.go @@ -6,18 +6,18 @@ import ( "time" daskAPI "github.com/dask/dask-kubernetes/v2023/dask_kubernetes/operator/go_client/pkg/apis/kubernetes.dask.org/v1" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/flyteplugins/go/tasks/plugins/k8s/dask/dask_test.go b/flyteplugins/go/tasks/plugins/k8s/dask/dask_test.go index 3ea3abba30..de36ada381 100644 --- a/flyteplugins/go/tasks/plugins/k8s/dask/dask_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/dask/dask_test.go @@ -6,11 +6,11 @@ import ( "time" daskAPI "github.com/dask/dask-kubernetes/v2023/dask_kubernetes/operator/go_client/pkg/apis/kubernetes.dask.org/v1" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + pluginIOMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - pluginIOMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" v1 "k8s.io/api/core/v1" @@ -18,10 +18,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" "github.com/golang/protobuf/jsonpb" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator.go index acaf09680a..e14ae3ccc7 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator.go @@ -5,15 +5,15 @@ import ( "sort" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" + flyteerr "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" kfplugins "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/kubeflow" - flyteerr "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" commonOp "github.com/kubeflow/common/pkg/apis/common/v1" v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator_test.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator_test.go index 7f74e3f58e..0883c0e37f 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/common_operator_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" commonOp "github.com/kubeflow/common/pkg/apis/common/v1" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/config.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/config.go index 7803e9097d..58427f5ce9 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/config.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/common/config.go @@ -3,8 +3,8 @@ package common import ( "time" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flytestdlib/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi.go index 7b6974ef8d..7af165b5d9 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi.go @@ -9,13 +9,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" kfplugins "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/kubeflow" - flyteerr "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" + flyteerr "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" commonOp "github.com/kubeflow/common/pkg/apis/common/v1" kubeflowv1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1" v1 "k8s.io/api/core/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go index b477ad93ec..f1584bc81a 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go @@ -10,13 +10,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" kfplugins "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/kubeflow" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - pluginIOMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + pluginIOMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" mpiOp "github.com/kubeflow/common/pkg/apis/common/v1" kubeflowv1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch.go index d6f18b1a33..e584335521 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch.go @@ -8,13 +8,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" kfplugins "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/kubeflow" - flyteerr "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" + flyteerr "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" commonOp "github.com/kubeflow/common/pkg/apis/common/v1" kubeflowv1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go index 4446f5b3ad..9c8c4c3789 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go @@ -6,23 +6,23 @@ import ( "testing" "time" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" commonOp "github.com/kubeflow/common/pkg/apis/common/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "github.com/stretchr/testify/mock" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" - pluginIOMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + pluginIOMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow.go index fb006935bf..352b080b3b 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow.go @@ -8,13 +8,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" kfplugins "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/kubeflow" - flyteerr "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" + flyteerr "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" commonOp "github.com/kubeflow/common/pkg/apis/common/v1" kubeflowv1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow_test.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow_test.go index f0013bbf92..844c313af6 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow_test.go @@ -6,23 +6,23 @@ import ( "testing" "time" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/common" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" commonOp "github.com/kubeflow/common/pkg/apis/common/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "github.com/stretchr/testify/mock" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" - pluginIOMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + pluginIOMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" diff --git a/flyteplugins/go/tasks/plugins/k8s/pod/container_test.go b/flyteplugins/go/tasks/plugins/k8s/pod/container_test.go index 13600168a4..ddc75fa858 100644 --- a/flyteplugins/go/tasks/plugins/k8s/pod/container_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/pod/container_test.go @@ -7,11 +7,11 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginsCoreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - pluginsIOMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCoreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + pluginsIOMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flyteplugins/go/tasks/plugins/k8s/pod/plugin.go b/flyteplugins/go/tasks/plugins/k8s/pod/plugin.go index 2ab446ee0c..aacfea7425 100644 --- a/flyteplugins/go/tasks/plugins/k8s/pod/plugin.go +++ b/flyteplugins/go/tasks/plugins/k8s/pod/plugin.go @@ -3,16 +3,16 @@ package pod import ( "context" - pluginserrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - - "github.com/flyteorg/flytestdlib/logger" + pluginserrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + + "github.com/flyteorg/flyte/flytestdlib/logger" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flyteplugins/go/tasks/plugins/k8s/pod/sidecar_test.go b/flyteplugins/go/tasks/plugins/k8s/pod/sidecar_test.go index b11fd623bc..850cc76383 100644 --- a/flyteplugins/go/tasks/plugins/k8s/pod/sidecar_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/pod/sidecar_test.go @@ -11,13 +11,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - errors2 "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginsCoreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - pluginsIOMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + errors2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCoreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + pluginsIOMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" structpb "github.com/golang/protobuf/ptypes/struct" diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/config.go b/flyteplugins/go/tasks/plugins/k8s/ray/config.go index 8b699cd798..7a79916ac7 100644 --- a/flyteplugins/go/tasks/plugins/k8s/ray/config.go +++ b/flyteplugins/go/tasks/plugins/k8s/ray/config.go @@ -1,8 +1,8 @@ package ray import ( - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - pluginmachinery "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + pluginmachinery "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go b/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go index 4fc005cce0..18499069dd 100644 --- a/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go @@ -3,7 +3,7 @@ package ray import ( "testing" - pluginmachinery "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + pluginmachinery "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" "gotest.tools/assert" ) diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/ray.go b/flyteplugins/go/tasks/plugins/k8s/ray/ray.go index f3fcaff38b..35b512a395 100644 --- a/flyteplugins/go/tasks/plugins/k8s/ray/ray.go +++ b/flyteplugins/go/tasks/plugins/k8s/ray/ray.go @@ -7,21 +7,21 @@ import ( "strings" "time" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" v1 "k8s.io/api/core/v1" - flyteerr "github.com/flyteorg/flyteplugins/go/tasks/errors" + flyteerr "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/ray_test.go b/flyteplugins/go/tasks/plugins/k8s/ray/ray_test.go index e3e4b55855..17860952df 100644 --- a/flyteplugins/go/tasks/plugins/k8s/ray/ray_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/ray/ray_test.go @@ -4,19 +4,19 @@ import ( "context" "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" "github.com/golang/protobuf/jsonpb" structpb "github.com/golang/protobuf/ptypes/struct" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + pluginIOMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - pluginIOMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training.go index 0116b4ebfc..de69f6a88a 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training.go @@ -9,27 +9,27 @@ import ( trainingjobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/trainingjob" - awsUtils "github.com/flyteorg/flyteplugins/go/tasks/plugins/awsutils" + awsUtils "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/awsutils" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flytestdlib/logger" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" "github.com/aws/aws-sdk-go/service/sagemaker" - taskError "github.com/flyteorg/flyteplugins/go/tasks/errors" + taskError "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" flyteSageMakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" ) const ReconcilingTrainingJobStatus = "ReconcilingTrainingJob" diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training_test.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training_test.go index 1634ff7b76..e2568de425 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/builtin_training_test.go @@ -7,17 +7,17 @@ import ( "github.com/go-test/deep" + taskError "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - taskError "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" - stdConfig "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" trainingjobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/trainingjob" "github.com/aws/aws-sdk-go/service/sagemaker" diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/config/config.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/config/config.go index 9f521ee570..48c4d1ca61 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/config/config.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/config/config.go @@ -1,6 +1,6 @@ package config -import pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" +import pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training.go index e8d81bf155..829c651ef1 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training.go @@ -10,19 +10,19 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/aws/aws-sdk-go/service/sagemaker" + taskError "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flytestdlib/logger" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - taskError "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytestdlib/logger" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" trainingjobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/trainingjob" flyteSageMakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training_test.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training_test.go index 748fa7d35b..35697b893a 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/custom_training_test.go @@ -11,17 +11,17 @@ import ( flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" sagemakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" "github.com/stretchr/testify/assert" trainingjobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/trainingjob" "github.com/aws/aws-sdk-go/service/sagemaker" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - stdConfig "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" ) func Test_awsSagemakerPlugin_BuildResourceForCustomTrainingJob(t *testing.T) { diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning.go index dc6e02eed5..fd77c6817b 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning.go @@ -7,28 +7,28 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - awsUtils "github.com/flyteorg/flyteplugins/go/tasks/plugins/awsutils" + awsUtils "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/awsutils" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flytestdlib/logger" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" hpojobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/hyperparametertuningjob" "github.com/aws/aws-sdk-go/service/sagemaker" - taskError "github.com/flyteorg/flyteplugins/go/tasks/errors" + taskError "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" flyteSageMakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" ) const ReconcilingTuningJobStatus = "ReconcilingTuningJob" diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning_test.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning_test.go index e710dc564c..f746c6ee77 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/hyperparameter_tuning_test.go @@ -7,12 +7,12 @@ import ( "github.com/go-test/deep" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - stdConfig "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" hpojobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/hyperparametertuningjob" sagemakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/outputs.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/outputs.go index e4da7ea953..fb166a1459 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/outputs.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/outputs.go @@ -6,13 +6,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/flyteorg/flyte/flytestdlib/logger" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" hpojobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/hyperparametertuningjob" trainingjobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/trainingjob" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" ) func createOutputLiteralMap(tk *core.TaskTemplate, outputPath string) *core.LiteralMap { diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin.go index 8d41eade70..623d55f674 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin.go @@ -5,17 +5,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" "k8s.io/client-go/kubernetes/scheme" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" hpojobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/hyperparametertuningjob" trainingjobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/trainingjob" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" ) // Sanity test that the plugin implements method of k8s.Plugin diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test.go index 94eb0f9a77..44150e547f 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test.go @@ -7,14 +7,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" hpojobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/hyperparametertuningjob" trainingjobv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/trainingjob" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" ) func Test_awsSagemakerPlugin_BuildIdentityResource(t *testing.T) { diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test_utils.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test_utils.go index 7bb74e30cf..b7178f3b81 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test_utils.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/plugin_test_utils.go @@ -1,20 +1,20 @@ package sagemaker import ( + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flytestdlib/promutils" "github.com/pkg/errors" "github.com/golang/protobuf/proto" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + pluginIOMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flytestdlib/storage" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" sagemakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - pluginIOMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/jsonpb" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/stretchr/testify/mock" diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils.go index de1354ad91..e27b068b5a 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils.go @@ -6,23 +6,23 @@ import ( "sort" "strings" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/Masterminds/semver" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" awsSdk "github.com/aws/aws-sdk-go-v2/aws" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" flyteSagemakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" - "github.com/flyteorg/flytestdlib/errors" "github.com/golang/protobuf/proto" ) diff --git a/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils_test.go b/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils_test.go index fb2795b390..fe0fd8ca1c 100644 --- a/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/sagemaker/utils_test.go @@ -10,18 +10,18 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" structpb "github.com/golang/protobuf/ptypes/struct" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" commonv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/common" + "github.com/flyteorg/flyte/flytestdlib/config/viper" sagemakerSpec "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" - "github.com/flyteorg/flytestdlib/config/viper" "github.com/stretchr/testify/assert" - stdConfig "github.com/flyteorg/flytestdlib/config" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" + sagemakerConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" flyteSagemakerIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins/sagemaker" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" - sagemakerConfig "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker/config" ) func makeGenericLiteral(st *structpb.Struct) *core.Literal { diff --git a/flyteplugins/go/tasks/plugins/k8s/spark/config.go b/flyteplugins/go/tasks/plugins/k8s/spark/config.go index a61f8685e8..4e97070470 100644 --- a/flyteplugins/go/tasks/plugins/k8s/spark/config.go +++ b/flyteplugins/go/tasks/plugins/k8s/spark/config.go @@ -1,8 +1,8 @@ package spark import ( - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/logs" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/plugins/k8s/spark/spark.go b/flyteplugins/go/tasks/plugins/k8s/spark/spark.go old mode 100755 new mode 100644 index 18d11a507a..1c7692aea2 --- a/flyteplugins/go/tasks/plugins/k8s/spark/spark.go +++ b/flyteplugins/go/tasks/plugins/k8s/spark/spark.go @@ -8,20 +8,20 @@ import ( "strconv" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/tasklog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/tasklog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/logs" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" "k8s.io/client-go/kubernetes/scheme" sparkOp "github.com/GoogleCloudPlatform/spark-on-k8s-operator/pkg/apis/sparkoperator.k8s.io/v1beta2" diff --git a/flyteplugins/go/tasks/plugins/k8s/spark/spark_test.go b/flyteplugins/go/tasks/plugins/k8s/spark/spark_test.go old mode 100755 new mode 100644 index efa52274bf..ebbbeb433b --- a/flyteplugins/go/tasks/plugins/k8s/spark/spark_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/spark/spark_test.go @@ -6,19 +6,19 @@ import ( "strconv" "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteplugins/go/tasks/logs" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/logs" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" - pluginIOMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + pluginIOMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" sj "github.com/GoogleCloudPlatform/spark-on-k8s-operator/pkg/apis/sparkoperator.k8s.io/v1beta2" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flyteplugins/go/tasks/plugins/presto/client/mocks/presto_client.go b/flyteplugins/go/tasks/plugins/presto/client/mocks/presto_client.go index 09f62c3456..2a79bdc3df 100644 --- a/flyteplugins/go/tasks/plugins/presto/client/mocks/presto_client.go +++ b/flyteplugins/go/tasks/plugins/presto/client/mocks/presto_client.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - client "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client" + client "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client" mock "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/plugins/presto/client/noop_presto_client.go b/flyteplugins/go/tasks/plugins/presto/client/noop_presto_client.go index 8ab05a4201..695b780b06 100644 --- a/flyteplugins/go/tasks/plugins/presto/client/noop_presto_client.go +++ b/flyteplugins/go/tasks/plugins/presto/client/noop_presto_client.go @@ -7,7 +7,7 @@ import ( "time" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/config" ) const ( diff --git a/flyteplugins/go/tasks/plugins/presto/config/config.go b/flyteplugins/go/tasks/plugins/presto/config/config.go index 0b4bbb3e52..6f8de3c5ff 100644 --- a/flyteplugins/go/tasks/plugins/presto/config/config.go +++ b/flyteplugins/go/tasks/plugins/presto/config/config.go @@ -7,10 +7,10 @@ import ( "net/url" "time" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" ) const prestoConfigSectionKey = "presto" diff --git a/flyteplugins/go/tasks/plugins/presto/execution_state.go b/flyteplugins/go/tasks/plugins/presto/execution_state.go index 1803d3ded6..2fbafca038 100644 --- a/flyteplugins/go/tasks/plugins/presto/execution_state.go +++ b/flyteplugins/go/tasks/plugins/presto/execution_state.go @@ -3,29 +3,29 @@ package presto import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" "k8s.io/apimachinery/pkg/util/rand" "fmt" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client" "time" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/config" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/logger" pb "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" ) diff --git a/flyteplugins/go/tasks/plugins/presto/execution_state_test.go b/flyteplugins/go/tasks/plugins/presto/execution_state_test.go index 9a2c4c15bc..a2625eb0e1 100644 --- a/flyteplugins/go/tasks/plugins/presto/execution_state_test.go +++ b/flyteplugins/go/tasks/plugins/presto/execution_state_test.go @@ -6,22 +6,22 @@ import ( "testing" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client" - prestoMocks "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/config" - mocks2 "github.com/flyteorg/flytestdlib/cache/mocks" - stdConfig "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client" + prestoMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/config" + mocks2 "github.com/flyteorg/flyte/flytestdlib/cache/mocks" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" + "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/plugins" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" ) func init() { diff --git a/flyteplugins/go/tasks/plugins/presto/executions_cache.go b/flyteplugins/go/tasks/plugins/presto/executions_cache.go index 29183aefb7..f4be7231ce 100644 --- a/flyteplugins/go/tasks/plugins/presto/executions_cache.go +++ b/flyteplugins/go/tasks/plugins/presto/executions_cache.go @@ -5,16 +5,16 @@ import ( "k8s.io/client-go/util/workqueue" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - stdErrors "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) const ( diff --git a/flyteplugins/go/tasks/plugins/presto/executions_cache_test.go b/flyteplugins/go/tasks/plugins/presto/executions_cache_test.go index e01f2d9ac8..e014d64b66 100644 --- a/flyteplugins/go/tasks/plugins/presto/executions_cache_test.go +++ b/flyteplugins/go/tasks/plugins/presto/executions_cache_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - prestoMocks "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client/mocks" + prestoMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client/mocks" - "github.com/flyteorg/flytestdlib/cache" - cacheMocks "github.com/flyteorg/flytestdlib/cache/mocks" + "github.com/flyteorg/flyte/flytestdlib/cache" + cacheMocks "github.com/flyteorg/flyte/flytestdlib/cache/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/config" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/plugins/presto/executor.go b/flyteplugins/go/tasks/plugins/presto/executor.go index 64420d92e9..7b452b0c68 100644 --- a/flyteplugins/go/tasks/plugins/presto/executor.go +++ b/flyteplugins/go/tasks/plugins/presto/executor.go @@ -3,16 +3,16 @@ package presto import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/client" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/client" - "github.com/flyteorg/flytestdlib/cache" + "github.com/flyteorg/flyte/flytestdlib/cache" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginMachinery "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/presto/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginMachinery "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/presto/config" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) // This is the name of this plugin effectively. In Flyte plugin configuration, use this string to enable this plugin. diff --git a/flyteplugins/go/tasks/plugins/presto/executor_metrics.go b/flyteplugins/go/tasks/plugins/presto/executor_metrics.go index 869d7e34db..3d283c65f6 100644 --- a/flyteplugins/go/tasks/plugins/presto/executor_metrics.go +++ b/flyteplugins/go/tasks/plugins/presto/executor_metrics.go @@ -1,8 +1,8 @@ package presto import ( - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) type ExecutorMetrics struct { diff --git a/flyteplugins/go/tasks/plugins/presto/helpers_test.go b/flyteplugins/go/tasks/plugins/presto/helpers_test.go index e2fd6ebfe3..27ee20df90 100644 --- a/flyteplugins/go/tasks/plugins/presto/helpers_test.go +++ b/flyteplugins/go/tasks/plugins/presto/helpers_test.go @@ -1,13 +1,13 @@ package presto import ( + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + coreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + ioMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flytestdlib/storage" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - coreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - ioMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytestdlib/storage" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/stretchr/testify/mock" v1 "k8s.io/api/core/v1" diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/config.go b/flyteplugins/go/tasks/plugins/webapi/agent/config.go index 475355e864..1045a7cf80 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/config.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/config.go @@ -3,10 +3,10 @@ package agent import ( "time" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/config" ) var ( diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/config_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/config_test.go index 1b36d03c86..b110897a47 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/config_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go index 0aeed67f5c..98abb635a0 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go @@ -8,24 +8,24 @@ import ( "testing" "time" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/tests" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/utils" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flyteplugins/tests" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" - "github.com/flyteorg/flytestdlib/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "google.golang.org/grpc" diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 128753b74b..45b19d4d80 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -6,22 +6,22 @@ import ( "encoding/gob" "fmt" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/config" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/grpclog" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/promutils" flyteIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/promutils" "google.golang.org/grpc" ) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index 180a0d6e6f..310c491de5 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "google.golang.org/grpc" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytestdlib/promutils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/config.go b/flyteplugins/go/tasks/plugins/webapi/athena/config.go index 59c3ab5d22..ab50887967 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/config.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/config.go @@ -3,10 +3,10 @@ package athena import ( "time" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go index 5bbf99bddd..983cc66d97 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go @@ -5,23 +5,23 @@ import ( "fmt" "time" - errors2 "github.com/flyteorg/flyteplugins/go/tasks/errors" + errors2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" awsSdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/athena" athenaTypes "github.com/aws/aws-sdk-go-v2/service/athena/types" - "github.com/flyteorg/flyteplugins/go/tasks/aws" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/aws" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) const ( diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/utils.go b/flyteplugins/go/tasks/plugins/webapi/athena/utils.go index b7f9fd6962..e229dc2979 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/utils.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/utils.go @@ -3,17 +3,17 @@ package athena import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + "github.com/flyteorg/flyte/flytestdlib/utils" pluginsIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/logger" pb "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/logger" ) func writeOutput(ctx context.Context, tCtx webapi.StatusContext, externalLocation string) error { diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/utils_test.go b/flyteplugins/go/tasks/plugins/webapi/athena/utils_test.go index 3686441853..2897c3da47 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/utils_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/utils_test.go @@ -7,20 +7,20 @@ import ( "github.com/golang/protobuf/proto" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" - mocks3 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + mocks3 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytestdlib/utils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" pb "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytestdlib/utils" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" ) func Test_writeOutput(t *testing.T) { diff --git a/flyteplugins/go/tasks/plugins/webapi/bigquery/config.go b/flyteplugins/go/tasks/plugins/webapi/bigquery/config.go index fe1bcad30e..c8c8ff1614 100644 --- a/flyteplugins/go/tasks/plugins/webapi/bigquery/config.go +++ b/flyteplugins/go/tasks/plugins/webapi/bigquery/config.go @@ -4,12 +4,12 @@ package bigquery import ( "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/google" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/google" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flyteplugins/go/tasks/plugins/webapi/bigquery/integration_test.go b/flyteplugins/go/tasks/plugins/webapi/bigquery/integration_test.go index 6244ba152a..7aa83bdf03 100644 --- a/flyteplugins/go/tasks/plugins/webapi/bigquery/integration_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/bigquery/integration_test.go @@ -11,15 +11,15 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + pluginUtils "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/tests" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - pluginUtils "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/tests" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "google.golang.org/api/bigquery/v2" diff --git a/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go b/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go index 2649576432..d423d13380 100644 --- a/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go @@ -7,29 +7,29 @@ import ( "net/http" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" "golang.org/x/oauth2" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/google" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/google" structpb "github.com/golang/protobuf/ptypes/struct" "google.golang.org/api/bigquery/v2" "google.golang.org/api/googleapi" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "google.golang.org/api/option" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) const ( diff --git a/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin_test.go index 151ab6d2d7..4cb25fa8a8 100644 --- a/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin_test.go @@ -5,20 +5,20 @@ import ( "testing" "time" - coreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + coreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/mock" "k8s.io/apimachinery/pkg/util/rand" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "github.com/stretchr/testify/assert" "google.golang.org/api/bigquery/v2" "google.golang.org/api/googleapi" diff --git a/flyteplugins/go/tasks/plugins/webapi/bigquery/query_job.go b/flyteplugins/go/tasks/plugins/webapi/bigquery/query_job.go index ccd3610f0f..096f162b6f 100644 --- a/flyteplugins/go/tasks/plugins/webapi/bigquery/query_job.go +++ b/flyteplugins/go/tasks/plugins/webapi/bigquery/query_job.go @@ -5,9 +5,9 @@ import ( "github.com/pkg/errors" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginUtils "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginUtils "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" structpb "github.com/golang/protobuf/ptypes/struct" "google.golang.org/api/bigquery/v2" ) diff --git a/flyteplugins/go/tasks/plugins/webapi/databricks/config.go b/flyteplugins/go/tasks/plugins/webapi/databricks/config.go index 7173959ec9..41e0fad4d3 100644 --- a/flyteplugins/go/tasks/plugins/webapi/databricks/config.go +++ b/flyteplugins/go/tasks/plugins/webapi/databricks/config.go @@ -3,10 +3,10 @@ package databricks import ( "time" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/config" ) var ( diff --git a/flyteplugins/go/tasks/plugins/webapi/databricks/integration_test.go b/flyteplugins/go/tasks/plugins/webapi/databricks/integration_test.go index a8070a04a3..7ef1a98e2c 100644 --- a/flyteplugins/go/tasks/plugins/webapi/databricks/integration_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/databricks/integration_test.go @@ -8,19 +8,19 @@ import ( "testing" "time" + "github.com/flyteorg/flyte/flytestdlib/utils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - "github.com/flyteorg/flytestdlib/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/tests" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/flyteorg/flyteidl/clients/go/coreutils" coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/tests" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go b/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go index dca3581d5c..7626cb9c6b 100644 --- a/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go @@ -10,22 +10,22 @@ import ( "net/http" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - - "github.com/flyteorg/flytestdlib/promutils" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + + "github.com/flyteorg/flyte/flytestdlib/promutils" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) const ( diff --git a/flyteplugins/go/tasks/plugins/webapi/databricks/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/databricks/plugin_test.go index 0b4e8aa8fc..a6976abe88 100644 --- a/flyteplugins/go/tasks/plugins/webapi/databricks/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/databricks/plugin_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytestdlib/promutils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/go/tasks/plugins/webapi/snowflake/config.go b/flyteplugins/go/tasks/plugins/webapi/snowflake/config.go index 4a6647e8c8..e61dbed01a 100644 --- a/flyteplugins/go/tasks/plugins/webapi/snowflake/config.go +++ b/flyteplugins/go/tasks/plugins/webapi/snowflake/config.go @@ -3,10 +3,10 @@ package snowflake import ( "time" - pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" - "github.com/flyteorg/flytestdlib/config" + pluginsConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flyte/flytestdlib/config" ) var ( diff --git a/flyteplugins/go/tasks/plugins/webapi/snowflake/integration_test.go b/flyteplugins/go/tasks/plugins/webapi/snowflake/integration_test.go index 3ee4048c3c..20641d76cd 100644 --- a/flyteplugins/go/tasks/plugins/webapi/snowflake/integration_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/snowflake/integration_test.go @@ -8,16 +8,16 @@ import ( "testing" "time" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/tests" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/flyteorg/flyteidl/clients/go/coreutils" coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/tests" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go b/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go index 09ff0156d3..88bb8f50f5 100644 --- a/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go @@ -10,19 +10,19 @@ import ( "net/http" "time" + errors2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/template" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - errors2 "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/template" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - - "github.com/flyteorg/flytestdlib/promutils" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + + "github.com/flyteorg/flyte/flytestdlib/promutils" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" ) const ( diff --git a/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin_test.go index 16a3ec4ae4..a7d79781e6 100644 --- a/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytestdlib/promutils" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flyteplugins/tests/end_to_end.go b/flyteplugins/tests/end_to_end.go index 0271ba86d7..3459a19260 100644 --- a/flyteplugins/tests/end_to_end.go +++ b/flyteplugins/tests/end_to_end.go @@ -21,21 +21,21 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - catalogMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/workqueue" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + catalogMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/workqueue" v1 "k8s.io/api/core/v1" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" "github.com/stretchr/testify/mock" - coreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + coreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" idlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flytepropeller/boilerplate/flyte/golang_support_tools/tools.go b/flytepropeller/boilerplate/flyte/golang_support_tools/tools.go index 43de03450c..a78b61162a 100644 --- a/flytepropeller/boilerplate/flyte/golang_support_tools/tools.go +++ b/flytepropeller/boilerplate/flyte/golang_support_tools/tools.go @@ -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" ) diff --git a/flytepropeller/cmd/controller/cmd/init_certs.go b/flytepropeller/cmd/controller/cmd/init_certs.go index f39edac1cd..588984ffd6 100644 --- a/flytepropeller/cmd/controller/cmd/init_certs.go +++ b/flytepropeller/cmd/controller/cmd/init_certs.go @@ -3,11 +3,11 @@ package cmd import ( "context" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - webhookConfig "github.com/flyteorg/flytepropeller/pkg/webhook/config" + webhookConfig "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytepropeller/pkg/webhook" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook" "github.com/spf13/cobra" ) diff --git a/flytepropeller/cmd/controller/cmd/root.go b/flytepropeller/cmd/controller/cmd/root.go index 465e625a8f..7547418a71 100644 --- a/flytepropeller/cmd/controller/cmd/root.go +++ b/flytepropeller/cmd/controller/cmd/root.go @@ -8,19 +8,19 @@ import ( "os" "runtime" - "github.com/flyteorg/flytepropeller/pkg/controller" - config2 "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/signals" - - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/profutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/version" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller" + config2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/signals" + + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/profutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/version" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/flytepropeller/cmd/controller/cmd/webhook.go b/flytepropeller/cmd/controller/cmd/webhook.go index 87e19448df..a6b9be0492 100644 --- a/flytepropeller/cmd/controller/cmd/webhook.go +++ b/flytepropeller/cmd/controller/cmd/webhook.go @@ -3,18 +3,18 @@ package cmd import ( "context" - "github.com/flyteorg/flytepropeller/pkg/controller" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/signals" - "github.com/flyteorg/flytepropeller/pkg/webhook" - webhookConfig "github.com/flyteorg/flytepropeller/pkg/webhook/config" - - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/profutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/signals" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook" + webhookConfig "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/profutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/spf13/cobra" diff --git a/flytepropeller/cmd/controller/main.go b/flytepropeller/cmd/controller/main.go index 3569756b4d..ac30364d30 100644 --- a/flytepropeller/cmd/controller/main.go +++ b/flytepropeller/cmd/controller/main.go @@ -1,9 +1,9 @@ package main import ( - _ "github.com/flyteorg/flytepropeller/plugins" + _ "github.com/flyteorg/flyte/flytepropeller/plugins" - "github.com/flyteorg/flytepropeller/cmd/controller/cmd" + "github.com/flyteorg/flyte/flytepropeller/cmd/controller/cmd" ) func main() { diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/compile.go b/flytepropeller/cmd/kubectl-flyte/cmd/compile.go index 2aa27b39de..ea5fc7d41e 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/compile.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/compile.go @@ -5,10 +5,10 @@ import ( "io/ioutil" "os" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + compilerErrors "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - compilerErrors "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/create.go b/flytepropeller/cmd/kubectl-flyte/cmd/create.go index 91ea38255c..bf202e6687 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/create.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/create.go @@ -13,12 +13,12 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + compilerErrors "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - compilerErrors "github.com/flyteorg/flytepropeller/pkg/compiler/errors" - "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/create_test.go b/flytepropeller/cmd/kubectl-flyte/cmd/create_test.go index a84aa9c5c9..a2a24fe76c 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/create_test.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/create_test.go @@ -10,11 +10,11 @@ import ( "github.com/ghodss/yaml" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/delete.go b/flytepropeller/cmd/kubectl-flyte/cmd/delete.go index 298fbdbedb..13dfb63eeb 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/delete.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/delete.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/flyteorg/flytepropeller/pkg/controller" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller" "github.com/spf13/cobra" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/get.go b/flytepropeller/cmd/kubectl-flyte/cmd/get.go index a75585b658..765f1e433e 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/get.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/get.go @@ -7,13 +7,13 @@ import ( "strings" gotree "github.com/DiSiqueira/GoTree" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/spf13/cobra" v12 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/cmd/kubectl-flyte/cmd/printers" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/cmd/kubectl-flyte/cmd/printers" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type GetOpts struct { diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/printers/node.go b/flytepropeller/cmd/kubectl-flyte/cmd/printers/node.go index ae00fb4116..b1d5e2936f 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/printers/node.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/printers/node.go @@ -9,11 +9,11 @@ import ( gotree "github.com/DiSiqueira/GoTree" "github.com/fatih/color" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" ) var boldString = color.New(color.Bold) diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/printers/workflow.go b/flytepropeller/cmd/kubectl-flyte/cmd/printers/workflow.go index 9fb1321e1f..ff881c938e 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/printers/workflow.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/printers/workflow.go @@ -8,8 +8,8 @@ import ( gotree "github.com/DiSiqueira/GoTree" "github.com/fatih/color" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/visualize" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/visualize" ) func ColorizeWorkflowPhase(p v1alpha1.WorkflowPhase) string { diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/root.go b/flytepropeller/cmd/kubectl-flyte/cmd/root.go index 7faa457000..ebc642c15f 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/root.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/root.go @@ -8,15 +8,15 @@ import ( "runtime" "time" - "github.com/flyteorg/flytestdlib/config/viper" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/version" + "github.com/flyteorg/flyte/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/version" "github.com/spf13/pflag" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - flyteclient "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" + flyteclient "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" "github.com/spf13/cobra" ) diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/visualize.go b/flytepropeller/cmd/kubectl-flyte/cmd/visualize.go index 9a0ed49a3f..6b6a3e82ad 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/visualize.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/visualize.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/flyteorg/flytepropeller/pkg/visualize" + "github.com/flyteorg/flyte/flytepropeller/pkg/visualize" "github.com/spf13/cobra" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/cmd/kubectl-flyte/main.go b/flytepropeller/cmd/kubectl-flyte/main.go index 64ac8eb20c..9fdaab95fe 100644 --- a/flytepropeller/cmd/kubectl-flyte/main.go +++ b/flytepropeller/cmd/kubectl-flyte/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/flyteorg/flytepropeller/cmd/kubectl-flyte/cmd" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytepropeller/cmd/kubectl-flyte/cmd" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) diff --git a/flytepropeller/cmd/manager/cmd/root.go b/flytepropeller/cmd/manager/cmd/root.go index 8cf2b939e5..2b8aeae5cb 100644 --- a/flytepropeller/cmd/manager/cmd/root.go +++ b/flytepropeller/cmd/manager/cmd/root.go @@ -7,18 +7,18 @@ import ( "os" "runtime" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/profutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/version" - - "github.com/flyteorg/flytepropeller/manager" - managerConfig "github.com/flyteorg/flytepropeller/manager/config" - propellerConfig "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/signals" - "github.com/flyteorg/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/profutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/version" + + "github.com/flyteorg/flyte/flytepropeller/manager" + managerConfig "github.com/flyteorg/flyte/flytepropeller/manager/config" + propellerConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/signals" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/flytepropeller/cmd/manager/main.go b/flytepropeller/cmd/manager/main.go index 9ced29741f..45829e5beb 100644 --- a/flytepropeller/cmd/manager/main.go +++ b/flytepropeller/cmd/manager/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/flyteorg/flytepropeller/cmd/manager/cmd" + "github.com/flyteorg/flyte/flytepropeller/cmd/manager/cmd" ) func main() { diff --git a/flytepropeller/events/admin_eventsink.go b/flytepropeller/events/admin_eventsink.go index debf10bd5a..9f1006620a 100644 --- a/flytepropeller/events/admin_eventsink.go +++ b/flytepropeller/events/admin_eventsink.go @@ -6,13 +6,13 @@ import ( admin2 "github.com/flyteorg/flyteidl/clients/go/admin" + "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytestdlib/fastcheck" + "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/event" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytestdlib/fastcheck" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" "github.com/golang/protobuf/proto" "golang.org/x/time/rate" ) diff --git a/flytepropeller/events/admin_eventsink_integration_test.go b/flytepropeller/events/admin_eventsink_integration_test.go index 44c23a3448..a2add91ac1 100644 --- a/flytepropeller/events/admin_eventsink_integration_test.go +++ b/flytepropeller/events/admin_eventsink_integration_test.go @@ -1,4 +1,6 @@ +//go:build integration // +build integration + // Add this tag to your project settings if you want to pick it up. package events @@ -15,7 +17,7 @@ import ( "github.com/flyteorg/flyteidl/clients/go/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/golang/protobuf/ptypes" ) @@ -30,11 +32,17 @@ var ( ) // To run this test, and see if the deadline working, pick an existing successful execution from your admin database -// select * from executions; +// +// select * from executions; +// // Then delete all the events from it. -// delete from execution_events where execution_name = 'ikuy55mn0y'; +// +// delete from execution_events where execution_name = 'ikuy55mn0y'; +// // Then run this -// begin work; lock table executions in ACCESS EXCLUSIVE mode; SELECT pg_sleep(20); commit work; +// +// begin work; lock table executions in ACCESS EXCLUSIVE mode; SELECT pg_sleep(20); commit work; +// // This will lock your table so that admin can't read it, causing the grpc call to timeout. // On timeout, you should get a deadline exceeded error. Otherwise, you should get an error to the effect of // "Invalid phase change from SUCCEEDED to RUNNING" or something like that. diff --git a/flytepropeller/events/admin_eventsink_test.go b/flytepropeller/events/admin_eventsink_test.go index 7349465594..46af5a5dd9 100644 --- a/flytepropeller/events/admin_eventsink_test.go +++ b/flytepropeller/events/admin_eventsink_test.go @@ -5,12 +5,12 @@ import ( "reflect" "testing" + "github.com/flyteorg/flyte/flytepropeller/events/errors" + fastcheckMocks "github.com/flyteorg/flyte/flytestdlib/fastcheck/mocks" "github.com/flyteorg/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events/errors" - fastcheckMocks "github.com/flyteorg/flytestdlib/fastcheck/mocks" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/events/config.go b/flytepropeller/events/config.go index 48625b57e1..895ae009b3 100644 --- a/flytepropeller/events/config.go +++ b/flytepropeller/events/config.go @@ -3,8 +3,8 @@ package events import ( "context" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" ) //go:generate pflags Config diff --git a/flytepropeller/events/errors/errors.go b/flytepropeller/events/errors/errors.go index a1b8b20cb6..1a12fa3f63 100644 --- a/flytepropeller/events/errors/errors.go +++ b/flytepropeller/events/errors/errors.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/logger" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/flytepropeller/events/event_recorder.go b/flytepropeller/events/event_recorder.go index 7366cd1cf4..dbe0a1dbdb 100644 --- a/flytepropeller/events/event_recorder.go +++ b/flytepropeller/events/event_recorder.go @@ -5,11 +5,11 @@ import ( "fmt" "time" + "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "github.com/golang/protobuf/proto" ) diff --git a/flytepropeller/events/event_recorder_test.go b/flytepropeller/events/event_recorder_test.go index cd4ab5a1d0..8b2b6f32a1 100644 --- a/flytepropeller/events/event_recorder_test.go +++ b/flytepropeller/events/event_recorder_test.go @@ -5,12 +5,12 @@ import ( "math/rand" "testing" + "github.com/flyteorg/flyte/flytepropeller/events/mocks" + "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/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/events/local_writer.go b/flytepropeller/events/local_writer.go index 4b556bcc8b..24c0c8d0f3 100644 --- a/flytepropeller/events/local_writer.go +++ b/flytepropeller/events/local_writer.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) // Log Writer writes to the log output diff --git a/flytepropeller/events/mocks/node_event_recorder.go b/flytepropeller/events/mocks/node_event_recorder.go index cc84763bda..6ae1f8833a 100644 --- a/flytepropeller/events/mocks/node_event_recorder.go +++ b/flytepropeller/events/mocks/node_event_recorder.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - config "github.com/flyteorg/flytepropeller/pkg/controller/config" + config "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" event "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flytepropeller/events/mocks/task_event_recorder.go b/flytepropeller/events/mocks/task_event_recorder.go index 1b27e57d44..18727d80fe 100644 --- a/flytepropeller/events/mocks/task_event_recorder.go +++ b/flytepropeller/events/mocks/task_event_recorder.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - config "github.com/flyteorg/flytepropeller/pkg/controller/config" + config "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" event "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flytepropeller/events/mocks/workflow_event_recorder.go b/flytepropeller/events/mocks/workflow_event_recorder.go index efab13150f..957f97780c 100644 --- a/flytepropeller/events/mocks/workflow_event_recorder.go +++ b/flytepropeller/events/mocks/workflow_event_recorder.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - config "github.com/flyteorg/flytepropeller/pkg/controller/config" + config "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" event "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flytepropeller/events/node_event_recorder.go b/flytepropeller/events/node_event_recorder.go index a6f0078ab6..b0e16d7a5a 100644 --- a/flytepropeller/events/node_event_recorder.go +++ b/flytepropeller/events/node_event_recorder.go @@ -4,13 +4,13 @@ import ( "context" "strings" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flytepropeller/events/node_event_recorder_test.go b/flytepropeller/events/node_event_recorder_test.go index 54129c7ef5..3878578fb7 100644 --- a/flytepropeller/events/node_event_recorder_test.go +++ b/flytepropeller/events/node_event_recorder_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flytepropeller/events/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" + storageMocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events/mocks" - "github.com/flyteorg/flytestdlib/storage" - storageMocks "github.com/flyteorg/flytestdlib/storage/mocks" "github.com/golang/protobuf/proto" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/events/task_event_recorder.go b/flytepropeller/events/task_event_recorder.go index d2060fc139..ba2e6dc938 100644 --- a/flytepropeller/events/task_event_recorder.go +++ b/flytepropeller/events/task_event_recorder.go @@ -4,13 +4,13 @@ import ( "context" "strings" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flytepropeller/events/task_event_recorder_test.go b/flytepropeller/events/task_event_recorder_test.go index e44b86c19f..d2e67801fd 100644 --- a/flytepropeller/events/task_event_recorder_test.go +++ b/flytepropeller/events/task_event_recorder_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flytepropeller/events/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" + storageMocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events/mocks" - "github.com/flyteorg/flytestdlib/storage" - storageMocks "github.com/flyteorg/flytestdlib/storage/mocks" "github.com/golang/protobuf/proto" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/events/test_utils.go b/flytepropeller/events/test_utils.go index e0aa827880..98a9fe7f56 100644 --- a/flytepropeller/events/test_utils.go +++ b/flytepropeller/events/test_utils.go @@ -1,8 +1,8 @@ package events import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/controller/config" ) var inlineEventConfig = &config.EventConfig{ diff --git a/flytepropeller/events/workflow_event_recorder.go b/flytepropeller/events/workflow_event_recorder.go index 13c6b6740c..5e70431516 100644 --- a/flytepropeller/events/workflow_event_recorder.go +++ b/flytepropeller/events/workflow_event_recorder.go @@ -4,13 +4,13 @@ import ( "context" "strings" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flytepropeller/events/workflow_event_recorder_test.go b/flytepropeller/events/workflow_event_recorder_test.go index 154661941a..9a4e2d6d0a 100644 --- a/flytepropeller/events/workflow_event_recorder_test.go +++ b/flytepropeller/events/workflow_event_recorder_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flytepropeller/events/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" + storageMocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events/mocks" - "github.com/flyteorg/flytestdlib/storage" - storageMocks "github.com/flyteorg/flytestdlib/storage/mocks" "github.com/golang/protobuf/proto" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/go.mod b/flytepropeller/go.mod index 85c1a0d4a1..6511bfe14c 100644 --- a/flytepropeller/go.mod +++ b/flytepropeller/go.mod @@ -1,4 +1,4 @@ -module github.com/flyteorg/flytepropeller +module github.com/flyteorg/flyte/flytepropeller go 1.19 @@ -6,9 +6,9 @@ require ( github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295 github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 github.com/fatih/color v1.13.0 - github.com/flyteorg/flyteidl v1.5.13 - github.com/flyteorg/flyteplugins v1.1.16 - github.com/flyteorg/flytestdlib v1.0.22 + github.com/flyteorg/flyte/flyteplugins v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyteidl v0.0.0-00010101000000-000000000000 github.com/ghodss/yaml v1.0.0 github.com/go-redis/redis v6.15.7+incompatible github.com/go-test/deep v1.0.7 @@ -145,4 +145,12 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d +replace ( + github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d + 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 +) diff --git a/flytepropeller/go.sum b/flytepropeller/go.sum index 7db68a26a2..41cb312151 100644 --- a/flytepropeller/go.sum +++ b/flytepropeller/go.sum @@ -242,12 +242,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flyteorg/flyteidl v1.5.13 h1:IQ2Cw+u36ew3BPyRDAcHdzc/GyNEOXOxhKy9jbS4hbo= -github.com/flyteorg/flyteidl v1.5.13/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flyteplugins v1.1.16 h1:DIQxPERFMvTGnLTkkeG9R8STF3YMvxK1nPtFf+a6o5Q= -github.com/flyteorg/flyteplugins v1.1.16/go.mod h1:HEd4yf0H8XfxMcHFwrTdTIJ/9lEAz83OpgcFQe47L6I= -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= diff --git a/flytepropeller/manager/config/config.go b/flytepropeller/manager/config/config.go index d6bc21ac13..70c636d600 100644 --- a/flytepropeller/manager/config/config.go +++ b/flytepropeller/manager/config/config.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var=DefaultConfig diff --git a/flytepropeller/manager/manager.go b/flytepropeller/manager/manager.go index 02b953a748..e8ea79a435 100644 --- a/flytepropeller/manager/manager.go +++ b/flytepropeller/manager/manager.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - managerConfig "github.com/flyteorg/flytepropeller/manager/config" - "github.com/flyteorg/flytepropeller/manager/shardstrategy" - propellerConfig "github.com/flyteorg/flytepropeller/pkg/controller/config" - leader "github.com/flyteorg/flytepropeller/pkg/leaderelection" - "github.com/flyteorg/flytepropeller/pkg/utils" - - stderrors "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + managerConfig "github.com/flyteorg/flyte/flytepropeller/manager/config" + "github.com/flyteorg/flyte/flytepropeller/manager/shardstrategy" + propellerConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + leader "github.com/flyteorg/flyte/flytepropeller/pkg/leaderelection" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + + stderrors "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/imdario/mergo" diff --git a/flytepropeller/manager/manager_test.go b/flytepropeller/manager/manager_test.go index 3886970063..08f3edb1dd 100644 --- a/flytepropeller/manager/manager_test.go +++ b/flytepropeller/manager/manager_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flytepropeller/manager/shardstrategy" - "github.com/flyteorg/flytepropeller/manager/shardstrategy/mocks" + "github.com/flyteorg/flyte/flytepropeller/manager/shardstrategy" + "github.com/flyteorg/flyte/flytepropeller/manager/shardstrategy/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flytepropeller/manager/shardstrategy/environment.go b/flytepropeller/manager/shardstrategy/environment.go index c7dec1bfff..e0b35d3c48 100644 --- a/flytepropeller/manager/shardstrategy/environment.go +++ b/flytepropeller/manager/shardstrategy/environment.go @@ -3,7 +3,7 @@ package shardstrategy import ( "fmt" - "github.com/flyteorg/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" v1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/manager/shardstrategy/hash.go b/flytepropeller/manager/shardstrategy/hash.go index 7de7e69f3e..357e49d303 100644 --- a/flytepropeller/manager/shardstrategy/hash.go +++ b/flytepropeller/manager/shardstrategy/hash.go @@ -3,8 +3,8 @@ package shardstrategy import ( "fmt" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" v1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/manager/shardstrategy/shard_strategy.go b/flytepropeller/manager/shardstrategy/shard_strategy.go index 217539295d..46d8567dc1 100644 --- a/flytepropeller/manager/shardstrategy/shard_strategy.go +++ b/flytepropeller/manager/shardstrategy/shard_strategy.go @@ -7,8 +7,8 @@ import ( "fmt" "hash/fnv" - "github.com/flyteorg/flytepropeller/manager/config" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/manager/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" v1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/branch_test.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/branch_test.go index 6b669072f4..5047ecdef3 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/branch_test.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/branch_test.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "testing" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/iface.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/iface.go index f5200669bd..e3f19a8edb 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/iface.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/iface.go @@ -12,9 +12,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/storage" ) // The intention of these interfaces is to decouple the algorithm and usage from the actual CRD definition. diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseNode.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseNode.go index 365d02fd3d..f1c7065db5 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseNode.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseNode.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflow.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflow.go index 4b4c384d04..3a8a8bdaca 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflow.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflow.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflowWithStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflowWithStatus.go index d3601d19c8..688d584ef0 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflowWithStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/BaseWorkflowWithStatus.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNode.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNode.go index fb200ff066..a4ca819a6a 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNode.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNode.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNodeStatus.go index 08de9e29c0..a59a3d575d 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableArrayNodeStatus.go @@ -3,12 +3,12 @@ package mocks import ( + bitarray "github.com/flyteorg/flyte/flytestdlib/bitarray" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - bitarray "github.com/flyteorg/flytestdlib/bitarray" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableArrayNodeStatus is an autogenerated mock type for the ExecutableArrayNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNode.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNode.go index 69ceb90c2e..267c69e9af 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNode.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNode.go @@ -6,7 +6,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableBranchNode is an autogenerated mock type for the ExecutableBranchNode type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNodeStatus.go index 6b6823ecd3..313fb99219 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableBranchNodeStatus.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableDynamicNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableDynamicNodeStatus.go index 130e5d13f8..25f63f5375 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableDynamicNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableDynamicNodeStatus.go @@ -6,7 +6,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableDynamicNodeStatus is an autogenerated mock type for the ExecutableDynamicNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNode.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNode.go index c7889632b1..fa9ec9178b 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNode.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNode.go @@ -6,7 +6,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableGateNode is an autogenerated mock type for the ExecutableGateNode type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNodeStatus.go index ba9ac5e69f..413df594a9 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableGateNodeStatus.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNode.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNode.go index a6f1432077..901148e820 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNode.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNode.go @@ -9,7 +9,7 @@ import ( v1 "k8s.io/api/core/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableNode is an autogenerated mock type for the ExecutableNode type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNodeStatus.go index 886aa217cc..040f90601f 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableNodeStatus.go @@ -8,11 +8,11 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableNodeStatus is an autogenerated mock type for the ExecutableNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflow.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflow.go index 0b09cf7483..87c8019a31 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflow.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflow.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflowNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflowNodeStatus.go index 0e7adc0f37..5b5376aa96 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflowNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableSubWorkflowNodeStatus.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableTaskNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableTaskNodeStatus.go index 899cab1b44..0d9b354571 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableTaskNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableTaskNodeStatus.go @@ -3,10 +3,10 @@ package mocks import ( - storage "github.com/flyteorg/flytestdlib/storage" - mock "github.com/stretchr/testify/mock" - time "time" + + storage "github.com/flyteorg/flyte/flytestdlib/storage" + mock "github.com/stretchr/testify/mock" ) // ExecutableTaskNodeStatus is an autogenerated mock type for the ExecutableTaskNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go index 42c8e694bd..9e8061c583 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go @@ -12,7 +12,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableWorkflow is an autogenerated mock type for the ExecutableWorkflow type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNode.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNode.go index f033cda946..fbaaf3cbeb 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNode.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNode.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNodeStatus.go index 52c7cf6c9b..54c4689a55 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowNodeStatus.go @@ -6,7 +6,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableWorkflowNodeStatus is an autogenerated mock type for the ExecutableWorkflowNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowStatus.go index cab458f650..9c10493a69 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflowStatus.go @@ -8,11 +8,11 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutableWorkflowStatus is an autogenerated mock type for the ExecutableWorkflowStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go index 4d38f70c98..590cda9618 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go @@ -10,7 +10,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // Meta is an autogenerated mock type for the Meta type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go index 5e0a048ad6..995c457443 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go @@ -10,7 +10,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // MetaExtended is an autogenerated mock type for the MetaExtended type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableArrayNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableArrayNodeStatus.go index e052187cce..838cf7af64 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableArrayNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableArrayNodeStatus.go @@ -3,12 +3,12 @@ package mocks import ( + bitarray "github.com/flyteorg/flyte/flytestdlib/bitarray" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - bitarray "github.com/flyteorg/flytestdlib/bitarray" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // MutableArrayNodeStatus is an autogenerated mock type for the MutableArrayNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableBranchNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableBranchNodeStatus.go index 724e5a787d..30eab0b6e9 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableBranchNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableBranchNodeStatus.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableDynamicNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableDynamicNodeStatus.go index bb102d58ba..72e0b3defa 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableDynamicNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableDynamicNodeStatus.go @@ -6,7 +6,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // MutableDynamicNodeStatus is an autogenerated mock type for the MutableDynamicNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableGateNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableGateNodeStatus.go index 498940ffff..5307047e12 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableGateNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableGateNodeStatus.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableNodeStatus.go index 56feb9c1bb..25ab6044c1 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableNodeStatus.go @@ -6,11 +6,11 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // MutableNodeStatus is an autogenerated mock type for the MutableNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableSubWorkflowNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableSubWorkflowNodeStatus.go index 07e605b93e..301a827d48 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableSubWorkflowNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableSubWorkflowNodeStatus.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableTaskNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableTaskNodeStatus.go index 4eea4400d4..380b1abdba 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableTaskNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableTaskNodeStatus.go @@ -3,10 +3,10 @@ package mocks import ( - storage "github.com/flyteorg/flytestdlib/storage" - mock "github.com/stretchr/testify/mock" - time "time" + + storage "github.com/flyteorg/flyte/flytestdlib/storage" + mock "github.com/stretchr/testify/mock" ) // MutableTaskNodeStatus is an autogenerated mock type for the MutableTaskNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableWorkflowNodeStatus.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableWorkflowNodeStatus.go index a12229e9c8..7a1f28493c 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableWorkflowNodeStatus.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/MutableWorkflowNodeStatus.go @@ -6,7 +6,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // MutableWorkflowNodeStatus is an autogenerated mock type for the MutableWorkflowNodeStatus type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeGetter.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeGetter.go index e5570eb0be..7b0f57a574 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeGetter.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeGetter.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusGetter.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusGetter.go index 9df44dcf97..50a2aad008 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusGetter.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusGetter.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusVisitor.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusVisitor.go index 737133b634..6124efacf9 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusVisitor.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/NodeStatusVisitor.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/SubWorkflowGetter.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/SubWorkflowGetter.go index dce6fe2099..eb3ceefb30 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/SubWorkflowGetter.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/SubWorkflowGetter.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/TaskDetailsGetter.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/TaskDetailsGetter.go index 70c1c1b558..7fb2f91ebc 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/TaskDetailsGetter.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/TaskDetailsGetter.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMeta.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMeta.go index 9324503979..e038e8dc44 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMeta.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMeta.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // Meta is an autogenerated mock type for the Meta type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMetaExtended.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMetaExtended.go index 236cc1c362..8ad47ba84c 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMetaExtended.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks/WorkflowMetaExtended.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // MetaExtended is an autogenerated mock type for the MetaExtended type diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status.go index b1f2699896..61553547e2 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status.go @@ -9,10 +9,10 @@ import ( "strconv" "time" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status_test.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status_test.go index 698b437ebe..56c5498d3c 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status_test.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/node_status_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/register.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/register.go index 857193c9be..8c5ea987a7 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/register.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/register.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/tasks_test.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/tasks_test.go index 9fb0577259..2d1ab15dc6 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/tasks_test.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/tasks_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow.go index d9cc4ab586..0995d9da3c 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "k8s.io/apimachinery/pkg/types" diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_status.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_status.go index e4cae0306a..28ec6bdf70 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_status.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_status.go @@ -4,10 +4,10 @@ import ( "context" "strconv" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_test.go b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_test.go index 4a5d66e7d9..001d3abf57 100644 --- a/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_test.go +++ b/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/workflow_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/ghodss/yaml" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/util/sets" diff --git a/flytepropeller/pkg/client/clientset/versioned/clientset.go b/flytepropeller/pkg/client/clientset/versioned/clientset.go index d733e6f6c2..93d2cabdb4 100644 --- a/flytepropeller/pkg/client/clientset/versioned/clientset.go +++ b/flytepropeller/pkg/client/clientset/versioned/clientset.go @@ -5,7 +5,7 @@ package versioned import ( "fmt" - flyteworkflowv1alpha1 "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" + flyteworkflowv1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/flytepropeller/pkg/client/clientset/versioned/fake/clientset_generated.go b/flytepropeller/pkg/client/clientset/versioned/fake/clientset_generated.go index db2a5d4e55..7504b10cb2 100644 --- a/flytepropeller/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/flytepropeller/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" - flyteworkflowv1alpha1 "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" - fakeflyteworkflowv1alpha1 "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake" + clientset "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" + flyteworkflowv1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" + fakeflyteworkflowv1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/flytepropeller/pkg/client/clientset/versioned/fake/register.go b/flytepropeller/pkg/client/clientset/versioned/fake/register.go index 7cfcd8c43e..3488b50d48 100644 --- a/flytepropeller/pkg/client/clientset/versioned/fake/register.go +++ b/flytepropeller/pkg/client/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - flyteworkflowv1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + flyteworkflowv1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -21,14 +21,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/flytepropeller/pkg/client/clientset/versioned/scheme/register.go b/flytepropeller/pkg/client/clientset/versioned/scheme/register.go index 8a14b2c24c..731dbb409d 100644 --- a/flytepropeller/pkg/client/clientset/versioned/scheme/register.go +++ b/flytepropeller/pkg/client/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - flyteworkflowv1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + flyteworkflowv1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -21,14 +21,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow.go b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow.go index 5af5c827ad..f7e8b0be5e 100644 --- a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow.go +++ b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow_client.go b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow_client.go index 6ac6bef663..b44c52f203 100644 --- a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow_client.go +++ b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/fake/fake_flyteworkflow_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow.go b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow.go index a06e1f074a..e97703a706 100644 --- a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow.go +++ b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - scheme "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + scheme "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow_client.go b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow_client.go index 039bb7d5ec..9f9029fcac 100644 --- a/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow_client.go +++ b/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1/flyteworkflow_client.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/flytepropeller/pkg/client/informers/externalversions/factory.go b/flytepropeller/pkg/client/informers/externalversions/factory.go index dd4a94df9e..e0ab713bd7 100644 --- a/flytepropeller/pkg/client/informers/externalversions/factory.go +++ b/flytepropeller/pkg/client/informers/externalversions/factory.go @@ -7,9 +7,9 @@ import ( sync "sync" time "time" - versioned "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" - flyteworkflow "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions/flyteworkflow" - internalinterfaces "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" + versioned "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" + flyteworkflow "github.com/flyteorg/flyte/flytepropeller/pkg/client/informers/externalversions/flyteworkflow" + internalinterfaces "github.com/flyteorg/flyte/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/interface.go b/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/interface.go index 359c6c2cb3..35047b241a 100644 --- a/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/interface.go +++ b/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/interface.go @@ -3,8 +3,8 @@ package flyteworkflow import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1" - internalinterfaces "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1" + internalinterfaces "github.com/flyteorg/flyte/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/flyteworkflow.go b/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/flyteworkflow.go index f2d21659ed..c26d86f5ed 100644 --- a/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/flyteworkflow.go +++ b/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/flyteworkflow.go @@ -6,10 +6,10 @@ import ( "context" time "time" - flyteworkflowv1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - versioned "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" - internalinterfaces "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" + flyteworkflowv1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + versioned "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" + internalinterfaces "github.com/flyteorg/flyte/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/interface.go b/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/interface.go index f1ea8749ea..7a3bfacf14 100644 --- a/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/interface.go +++ b/flytepropeller/pkg/client/informers/externalversions/flyteworkflow/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/flyteorg/flyte/flytepropeller/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/flytepropeller/pkg/client/informers/externalversions/generic.go b/flytepropeller/pkg/client/informers/externalversions/generic.go index d5657a1abf..dcc48fac03 100644 --- a/flytepropeller/pkg/client/informers/externalversions/generic.go +++ b/flytepropeller/pkg/client/informers/externalversions/generic.go @@ -5,7 +5,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/flytepropeller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/flytepropeller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index c57cb9ddc7..da769f285b 100644 --- a/flytepropeller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/flytepropeller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,7 +5,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" + versioned "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1/flyteworkflow.go b/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1/flyteworkflow.go index 8d6dda8ee7..cc44bb3684 100644 --- a/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1/flyteworkflow.go +++ b/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1/flyteworkflow.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/flytepropeller/pkg/compiler/builders.go b/flytepropeller/pkg/compiler/builders.go old mode 100755 new mode 100644 index 6fe2b805ae..fd50129827 --- a/flytepropeller/pkg/compiler/builders.go +++ b/flytepropeller/pkg/compiler/builders.go @@ -3,8 +3,8 @@ package compiler import ( "fmt" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" ) type flyteTask = core.TaskTemplate //nolint:unused diff --git a/flytepropeller/pkg/compiler/common/builder.go b/flytepropeller/pkg/compiler/common/builder.go index 84238db910..7a72d444cc 100644 --- a/flytepropeller/pkg/compiler/common/builder.go +++ b/flytepropeller/pkg/compiler/common/builder.go @@ -2,8 +2,8 @@ package common import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" ) const ( diff --git a/flytepropeller/pkg/compiler/common/index.go b/flytepropeller/pkg/compiler/common/index.go index 1a776b4e32..4faeb85d2f 100644 --- a/flytepropeller/pkg/compiler/common/index.go +++ b/flytepropeller/pkg/compiler/common/index.go @@ -1,8 +1,8 @@ package common import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/flytepropeller/pkg/compiler/common/mocks/node.go b/flytepropeller/pkg/compiler/common/mocks/node.go index ea9a24df16..e254845d0b 100644 --- a/flytepropeller/pkg/compiler/common/mocks/node.go +++ b/flytepropeller/pkg/compiler/common/mocks/node.go @@ -3,8 +3,8 @@ package mocks import ( + common "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - common "github.com/flyteorg/flytepropeller/pkg/compiler/common" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/compiler/common/mocks/node_builder.go b/flytepropeller/pkg/compiler/common/mocks/node_builder.go index 9ab7501306..34adac251f 100644 --- a/flytepropeller/pkg/compiler/common/mocks/node_builder.go +++ b/flytepropeller/pkg/compiler/common/mocks/node_builder.go @@ -3,8 +3,8 @@ package mocks import ( + common "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - common "github.com/flyteorg/flytepropeller/pkg/compiler/common" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/compiler/common/mocks/workflow.go b/flytepropeller/pkg/compiler/common/mocks/workflow.go index 1d4eac9d91..c6a5846507 100644 --- a/flytepropeller/pkg/compiler/common/mocks/workflow.go +++ b/flytepropeller/pkg/compiler/common/mocks/workflow.go @@ -3,8 +3,8 @@ package mocks import ( + common "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - common "github.com/flyteorg/flytepropeller/pkg/compiler/common" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/compiler/common/mocks/workflow_builder.go b/flytepropeller/pkg/compiler/common/mocks/workflow_builder.go index 8022b9f406..52d3f7803a 100644 --- a/flytepropeller/pkg/compiler/common/mocks/workflow_builder.go +++ b/flytepropeller/pkg/compiler/common/mocks/workflow_builder.go @@ -3,10 +3,10 @@ package mocks import ( + common "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - common "github.com/flyteorg/flytepropeller/pkg/compiler/common" - errors "github.com/flyteorg/flytepropeller/pkg/compiler/errors" + errors "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/compiler/requirements.go b/flytepropeller/pkg/compiler/requirements.go old mode 100755 new mode 100644 index b9f589ad79..389b10f909 --- a/flytepropeller/pkg/compiler/requirements.go +++ b/flytepropeller/pkg/compiler/requirements.go @@ -1,9 +1,9 @@ package compiler import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" ) type TaskIdentifier = common.Identifier diff --git a/flytepropeller/pkg/compiler/task_compiler.go b/flytepropeller/pkg/compiler/task_compiler.go index a310ee31f2..437a2148a7 100644 --- a/flytepropeller/pkg/compiler/task_compiler.go +++ b/flytepropeller/pkg/compiler/task_compiler.go @@ -3,13 +3,13 @@ package compiler import ( "fmt" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/validation" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/flytepropeller/pkg/compiler/task_compiler_test.go b/flytepropeller/pkg/compiler/task_compiler_test.go index cda0482ebb..1d79a8f3f0 100644 --- a/flytepropeller/pkg/compiler/task_compiler_test.go +++ b/flytepropeller/pkg/compiler/task_compiler_test.go @@ -3,10 +3,10 @@ package compiler import ( "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" v1 "k8s.io/api/core/v1" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/pkg/compiler/test/compiler_test.go b/flytepropeller/pkg/compiler/test/compiler_test.go index 8f934aa280..afd6b80f9a 100644 --- a/flytepropeller/pkg/compiler/test/compiler_test.go +++ b/flytepropeller/pkg/compiler/test/compiler_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/flyteorg/flytepropeller/pkg/visualize" + "github.com/flyteorg/flyte/flytepropeller/pkg/visualize" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" @@ -21,12 +21,12 @@ import ( "github.com/ghodss/yaml" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" - "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/pkg/compiler/transformers/k8s/builder_mock_test.go b/flytepropeller/pkg/compiler/transformers/k8s/builder_mock_test.go index 95e137a1ae..ca30090072 100644 --- a/flytepropeller/pkg/compiler/transformers/k8s/builder_mock_test.go +++ b/flytepropeller/pkg/compiler/transformers/k8s/builder_mock_test.go @@ -1,8 +1,8 @@ package k8s import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" ) type mockWorkflow struct { diff --git a/flytepropeller/pkg/compiler/transformers/k8s/inputs.go b/flytepropeller/pkg/compiler/transformers/k8s/inputs.go index fe365c7ff7..81d8d65463 100644 --- a/flytepropeller/pkg/compiler/transformers/k8s/inputs.go +++ b/flytepropeller/pkg/compiler/transformers/k8s/inputs.go @@ -1,10 +1,10 @@ package k8s import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" - "github.com/flyteorg/flytepropeller/pkg/compiler/validators" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/flytepropeller/pkg/compiler/transformers/k8s/node.go b/flytepropeller/pkg/compiler/transformers/k8s/node.go index 9bc0f608ed..2af4b9626f 100644 --- a/flytepropeller/pkg/compiler/transformers/k8s/node.go +++ b/flytepropeller/pkg/compiler/transformers/k8s/node.go @@ -3,11 +3,11 @@ package k8s import ( "strings" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "github.com/go-test/deep" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/pkg/compiler/transformers/k8s/node_test.go b/flytepropeller/pkg/compiler/transformers/k8s/node_test.go index e879f2cb31..16f7008c16 100644 --- a/flytepropeller/pkg/compiler/transformers/k8s/node_test.go +++ b/flytepropeller/pkg/compiler/transformers/k8s/node_test.go @@ -6,9 +6,9 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/pkg/compiler/transformers/k8s/utils.go b/flytepropeller/pkg/compiler/transformers/k8s/utils.go index 85a8c40564..c2aa02b855 100644 --- a/flytepropeller/pkg/compiler/transformers/k8s/utils.go +++ b/flytepropeller/pkg/compiler/transformers/k8s/utils.go @@ -5,8 +5,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/golang/protobuf/ptypes" ) diff --git a/flytepropeller/pkg/compiler/transformers/k8s/workflow.go b/flytepropeller/pkg/compiler/transformers/k8s/workflow.go index 2719db93ae..b33837499d 100644 --- a/flytepropeller/pkg/compiler/transformers/k8s/workflow.go +++ b/flytepropeller/pkg/compiler/transformers/k8s/workflow.go @@ -6,11 +6,11 @@ import ( "hash/fnv" "strings" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" - "github.com/flyteorg/flytepropeller/pkg/utils" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/pkg/compiler/transformers/k8s/workflow_test.go b/flytepropeller/pkg/compiler/transformers/k8s/workflow_test.go index f9c9a8c517..f650c7972a 100644 --- a/flytepropeller/pkg/compiler/transformers/k8s/workflow_test.go +++ b/flytepropeller/pkg/compiler/transformers/k8s/workflow_test.go @@ -5,10 +5,10 @@ import ( "io/ioutil" "testing" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/util/sets" diff --git a/flytepropeller/pkg/compiler/utils.go b/flytepropeller/pkg/compiler/utils.go old mode 100755 new mode 100644 index 4e433cc8ee..ce26c97196 --- a/flytepropeller/pkg/compiler/utils.go +++ b/flytepropeller/pkg/compiler/utils.go @@ -1,8 +1,8 @@ package compiler import ( + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/flytepropeller/pkg/compiler/validators/bindings.go b/flytepropeller/pkg/compiler/validators/bindings.go index 2942424fea..c5b918c964 100644 --- a/flytepropeller/pkg/compiler/validators/bindings.go +++ b/flytepropeller/pkg/compiler/validators/bindings.go @@ -3,11 +3,11 @@ package validators import ( "reflect" - "github.com/flyteorg/flytepropeller/pkg/compiler/typing" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/typing" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" flyte "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/flytepropeller/pkg/compiler/validators/bindings_test.go b/flytepropeller/pkg/compiler/validators/bindings_test.go index f240cf1d82..c30ebbae60 100644 --- a/flytepropeller/pkg/compiler/validators/bindings_test.go +++ b/flytepropeller/pkg/compiler/validators/bindings_test.go @@ -3,12 +3,12 @@ package validators import ( "testing" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common/mocks" + compilerErrors "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common/mocks" - compilerErrors "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flytepropeller/pkg/compiler/validators/branch.go b/flytepropeller/pkg/compiler/validators/branch.go index 01bec3c454..072d626a6f 100644 --- a/flytepropeller/pkg/compiler/validators/branch.go +++ b/flytepropeller/pkg/compiler/validators/branch.go @@ -1,9 +1,9 @@ package validators import ( + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" flyte "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/flytepropeller/pkg/compiler/validators/branch_test.go b/flytepropeller/pkg/compiler/validators/branch_test.go index 4c28e3fd3a..2cdd23da52 100644 --- a/flytepropeller/pkg/compiler/validators/branch_test.go +++ b/flytepropeller/pkg/compiler/validators/branch_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/mock" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common/mocks" + compilerErrors "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common/mocks" - compilerErrors "github.com/flyteorg/flytepropeller/pkg/compiler/errors" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/compiler/validators/condition.go b/flytepropeller/pkg/compiler/validators/condition.go index a70c5dcb2b..70d7a96f4c 100644 --- a/flytepropeller/pkg/compiler/validators/condition.go +++ b/flytepropeller/pkg/compiler/validators/condition.go @@ -3,9 +3,9 @@ package validators import ( "fmt" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" flyte "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" ) func validateOperand(node c.NodeBuilder, paramName string, operand *flyte.Operand, diff --git a/flytepropeller/pkg/compiler/validators/interface.go b/flytepropeller/pkg/compiler/validators/interface.go index cdee66a45f..5359926080 100644 --- a/flytepropeller/pkg/compiler/validators/interface.go +++ b/flytepropeller/pkg/compiler/validators/interface.go @@ -3,9 +3,9 @@ package validators import ( "fmt" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" ) // ValidateInterface validates interface has its required attributes set diff --git a/flytepropeller/pkg/compiler/validators/interface_test.go b/flytepropeller/pkg/compiler/validators/interface_test.go index 9a2183ebf4..ef0e77239e 100644 --- a/flytepropeller/pkg/compiler/validators/interface_test.go +++ b/flytepropeller/pkg/compiler/validators/interface_test.go @@ -8,9 +8,9 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/common/mocks" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flytepropeller/pkg/compiler/validators/node.go b/flytepropeller/pkg/compiler/validators/node.go index b4de4be04d..495a1420ed 100644 --- a/flytepropeller/pkg/compiler/validators/node.go +++ b/flytepropeller/pkg/compiler/validators/node.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" flyte "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" ) // Computes output parameters after applying all aliases -if any-. diff --git a/flytepropeller/pkg/compiler/validators/node_test.go b/flytepropeller/pkg/compiler/validators/node_test.go index 3fa1309eec..f4167298f4 100644 --- a/flytepropeller/pkg/compiler/validators/node_test.go +++ b/flytepropeller/pkg/compiler/validators/node_test.go @@ -3,12 +3,12 @@ package validators import ( "testing" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/compiler/common/mocks" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/compiler/validators/vars.go b/flytepropeller/pkg/compiler/validators/vars.go index a01ab062cf..2d1a7ba25e 100644 --- a/flytepropeller/pkg/compiler/validators/vars.go +++ b/flytepropeller/pkg/compiler/validators/vars.go @@ -1,9 +1,9 @@ package validators import ( + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" flyte "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" ) func validateOutputVar(n c.NodeBuilder, paramName string, errs errors.CompileErrors) ( diff --git a/flytepropeller/pkg/compiler/workflow_compiler.go b/flytepropeller/pkg/compiler/workflow_compiler.go old mode 100755 new mode 100644 index cfcb08f6b4..c54f9d1366 --- a/flytepropeller/pkg/compiler/workflow_compiler.go +++ b/flytepropeller/pkg/compiler/workflow_compiler.go @@ -34,10 +34,10 @@ package compiler import ( "strings" + c "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" + v "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - c "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" - v "github.com/flyteorg/flytepropeller/pkg/compiler/validators" // #noSA1019 "github.com/golang/protobuf/proto" diff --git a/flytepropeller/pkg/compiler/workflow_compiler_test.go b/flytepropeller/pkg/compiler/workflow_compiler_test.go old mode 100755 new mode 100644 index 272bba3cdc..2d932b5662 --- a/flytepropeller/pkg/compiler/workflow_compiler_test.go +++ b/flytepropeller/pkg/compiler/workflow_compiler_test.go @@ -5,14 +5,14 @@ import ( "strings" "testing" - "github.com/flyteorg/flytepropeller/pkg/compiler/common/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/errors" + v "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" + "github.com/flyteorg/flyte/flytepropeller/pkg/visualize" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/errors" - v "github.com/flyteorg/flytepropeller/pkg/compiler/validators" - "github.com/flyteorg/flytepropeller/pkg/visualize" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/flytepropeller/pkg/controller/completed_workflows.go b/flytepropeller/pkg/controller/completed_workflows.go index d48e190613..53d4fae69b 100644 --- a/flytepropeller/pkg/controller/completed_workflows.go +++ b/flytepropeller/pkg/controller/completed_workflows.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/pkg/controller/completed_workflows_test.go b/flytepropeller/pkg/controller/completed_workflows_test.go index 33897215c7..be78be665d 100644 --- a/flytepropeller/pkg/controller/completed_workflows_test.go +++ b/flytepropeller/pkg/controller/completed_workflows_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/stretchr/testify/assert" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/flytepropeller/pkg/controller/composite_workqueue.go b/flytepropeller/pkg/controller/composite_workqueue.go index 6d0f85c57f..b60d0ea79b 100644 --- a/flytepropeller/pkg/controller/composite_workqueue.go +++ b/flytepropeller/pkg/controller/composite_workqueue.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/workqueue" diff --git a/flytepropeller/pkg/controller/composite_workqueue_test.go b/flytepropeller/pkg/controller/composite_workqueue_test.go index 647db521cb..1680131f47 100644 --- a/flytepropeller/pkg/controller/composite_workqueue_test.go +++ b/flytepropeller/pkg/controller/composite_workqueue_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - config2 "github.com/flyteorg/flytepropeller/pkg/controller/config" + config2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/config/config.go b/flytepropeller/pkg/controller/config/config.go index 7589c6aacf..06becf1dd1 100644 --- a/flytepropeller/pkg/controller/config/config.go +++ b/flytepropeller/pkg/controller/config/config.go @@ -36,8 +36,8 @@ package config import ( "time" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "k8s.io/apimachinery/pkg/types" ) diff --git a/flytepropeller/pkg/controller/controller.go b/flytepropeller/pkg/controller/controller.go index 3aedbed647..3522e62c81 100644 --- a/flytepropeller/pkg/controller/controller.go +++ b/flytepropeller/pkg/controller/controller.go @@ -12,35 +12,35 @@ import ( "github.com/flyteorg/flyteidl/clients/go/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - flyteK8sConfig "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - - "github.com/flyteorg/flytepropeller/events" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - clientset "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned" - informers "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions" - lister "github.com/flyteorg/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/catalog" - errors3 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/factory" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - "github.com/flyteorg/flytepropeller/pkg/controller/workflow" - "github.com/flyteorg/flytepropeller/pkg/controller/workflowstore" - leader "github.com/flyteorg/flytepropeller/pkg/leaderelection" - "github.com/flyteorg/flytepropeller/pkg/utils" - - "github.com/flyteorg/flytestdlib/contextutils" - stdErrs "github.com/flyteorg/flytestdlib/errors" - "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/flyteplugins/go/tasks/pluginmachinery/flytek8s" + flyteK8sConfig "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + + "github.com/flyteorg/flyte/flytepropeller/events" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + clientset "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned" + informers "github.com/flyteorg/flyte/flytepropeller/pkg/client/informers/externalversions" + lister "github.com/flyteorg/flyte/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog" + errors3 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/factory" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflow" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflowstore" + leader "github.com/flyteorg/flyte/flytepropeller/pkg/leaderelection" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + + "github.com/flyteorg/flyte/flytestdlib/contextutils" + stdErrs "github.com/flyteorg/flyte/flytestdlib/errors" + "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" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" diff --git a/flytepropeller/pkg/controller/controller_test.go b/flytepropeller/pkg/controller/controller_test.go index 989d249cb3..f7405db4d8 100644 --- a/flytepropeller/pkg/controller/controller_test.go +++ b/flytepropeller/pkg/controller/controller_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + listers "github.com/flyteorg/flyte/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - listers "github.com/flyteorg/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/labels" diff --git a/flytepropeller/pkg/controller/executors/dag_structure.go b/flytepropeller/pkg/controller/executors/dag_structure.go index cd0f1be3ce..da9cb2e782 100644 --- a/flytepropeller/pkg/controller/executors/dag_structure.go +++ b/flytepropeller/pkg/controller/executors/dag_structure.go @@ -3,7 +3,7 @@ package executors import ( "fmt" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // An interface that captures the Directed Acyclic Graph structure in which the nodes are connected. diff --git a/flytepropeller/pkg/controller/executors/execution_context.go b/flytepropeller/pkg/controller/executors/execution_context.go index 53c0bbbd11..d2138ee133 100644 --- a/flytepropeller/pkg/controller/executors/execution_context.go +++ b/flytepropeller/pkg/controller/executors/execution_context.go @@ -1,7 +1,7 @@ package executors import ( - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type TaskDetailsGetter interface { diff --git a/flytepropeller/pkg/controller/executors/kube.go b/flytepropeller/pkg/controller/executors/kube.go index a37e7a2165..ffaa980ab5 100644 --- a/flytepropeller/pkg/controller/executors/kube.go +++ b/flytepropeller/pkg/controller/executors/kube.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/fastcheck" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/fastcheck" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/client-go/rest" diff --git a/flytepropeller/pkg/controller/executors/kube_test.go b/flytepropeller/pkg/controller/executors/kube_test.go index 9e3fc0e6c4..8b2aa4d626 100644 --- a/flytepropeller/pkg/controller/executors/kube_test.go +++ b/flytepropeller/pkg/controller/executors/kube_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flytepropeller/pkg/controller/executors/mocks/client_builder.go b/flytepropeller/pkg/controller/executors/mocks/client_builder.go index 56d72dddbb..3180f480fd 100644 --- a/flytepropeller/pkg/controller/executors/mocks/client_builder.go +++ b/flytepropeller/pkg/controller/executors/mocks/client_builder.go @@ -6,7 +6,7 @@ import ( cache "sigs.k8s.io/controller-runtime/pkg/cache" client "sigs.k8s.io/controller-runtime/pkg/client" - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" mock "github.com/stretchr/testify/mock" diff --git a/flytepropeller/pkg/controller/executors/mocks/dag_structure_with_start_node.go b/flytepropeller/pkg/controller/executors/mocks/dag_structure_with_start_node.go index dfc07c261d..84d64211dd 100644 --- a/flytepropeller/pkg/controller/executors/mocks/dag_structure_with_start_node.go +++ b/flytepropeller/pkg/controller/executors/mocks/dag_structure_with_start_node.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/executors/mocks/execution_context.go b/flytepropeller/pkg/controller/executors/mocks/execution_context.go index cc919f641f..d32d6b8320 100644 --- a/flytepropeller/pkg/controller/executors/mocks/execution_context.go +++ b/flytepropeller/pkg/controller/executors/mocks/execution_context.go @@ -4,7 +4,7 @@ package mocks import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" mock "github.com/stretchr/testify/mock" @@ -12,7 +12,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ExecutionContext is an autogenerated mock type for the ExecutionContext type diff --git a/flytepropeller/pkg/controller/executors/mocks/immutable_execution_context.go b/flytepropeller/pkg/controller/executors/mocks/immutable_execution_context.go index 1b4dfb6d02..0fc619d204 100644 --- a/flytepropeller/pkg/controller/executors/mocks/immutable_execution_context.go +++ b/flytepropeller/pkg/controller/executors/mocks/immutable_execution_context.go @@ -11,7 +11,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // ImmutableExecutionContext is an autogenerated mock type for the ImmutableExecutionContext type diff --git a/flytepropeller/pkg/controller/executors/mocks/node_lookup.go b/flytepropeller/pkg/controller/executors/mocks/node_lookup.go index eac909a110..c5f45e04d8 100644 --- a/flytepropeller/pkg/controller/executors/mocks/node_lookup.go +++ b/flytepropeller/pkg/controller/executors/mocks/node_lookup.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // NodeLookup is an autogenerated mock type for the NodeLookup type diff --git a/flytepropeller/pkg/controller/executors/mocks/parent_info_getter.go b/flytepropeller/pkg/controller/executors/mocks/parent_info_getter.go index f845cf5082..829b32fee5 100644 --- a/flytepropeller/pkg/controller/executors/mocks/parent_info_getter.go +++ b/flytepropeller/pkg/controller/executors/mocks/parent_info_getter.go @@ -3,7 +3,7 @@ package mocks import ( - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/executors/mocks/sub_workflow_getter.go b/flytepropeller/pkg/controller/executors/mocks/sub_workflow_getter.go index dce6fe2099..eb3ceefb30 100644 --- a/flytepropeller/pkg/controller/executors/mocks/sub_workflow_getter.go +++ b/flytepropeller/pkg/controller/executors/mocks/sub_workflow_getter.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/executors/mocks/task_details_getter.go b/flytepropeller/pkg/controller/executors/mocks/task_details_getter.go index 70c1c1b558..7fb2f91ebc 100644 --- a/flytepropeller/pkg/controller/executors/mocks/task_details_getter.go +++ b/flytepropeller/pkg/controller/executors/mocks/task_details_getter.go @@ -3,7 +3,7 @@ package mocks import ( - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/executors/mocks/workflow.go b/flytepropeller/pkg/controller/executors/mocks/workflow.go index 227f529100..bbf899a95d 100644 --- a/flytepropeller/pkg/controller/executors/mocks/workflow.go +++ b/flytepropeller/pkg/controller/executors/mocks/workflow.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // Workflow is an autogenerated mock type for the Workflow type diff --git a/flytepropeller/pkg/controller/executors/node_lookup.go b/flytepropeller/pkg/controller/executors/node_lookup.go index 66fc9bddf7..dc8e89fe61 100644 --- a/flytepropeller/pkg/controller/executors/node_lookup.go +++ b/flytepropeller/pkg/controller/executors/node_lookup.go @@ -3,7 +3,7 @@ package executors import ( "context" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // NodeLookup provides a structure that enables looking up all nodes within the current execution hierarchy/context. diff --git a/flytepropeller/pkg/controller/executors/node_lookup_test.go b/flytepropeller/pkg/controller/executors/node_lookup_test.go index 4bce76138c..889ea62236 100644 --- a/flytepropeller/pkg/controller/executors/node_lookup_test.go +++ b/flytepropeller/pkg/controller/executors/node_lookup_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" ) type ng struct { diff --git a/flytepropeller/pkg/controller/executors/workflow.go b/flytepropeller/pkg/controller/executors/workflow.go index 59bc1efe3e..ab8de88087 100644 --- a/flytepropeller/pkg/controller/executors/workflow.go +++ b/flytepropeller/pkg/controller/executors/workflow.go @@ -3,7 +3,7 @@ package executors import ( "context" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type Workflow interface { diff --git a/flytepropeller/pkg/controller/garbage_collector.go b/flytepropeller/pkg/controller/garbage_collector.go index 3fbbc7b48a..0b5e9094eb 100644 --- a/flytepropeller/pkg/controller/garbage_collector.go +++ b/flytepropeller/pkg/controller/garbage_collector.go @@ -5,15 +5,15 @@ import ( "runtime/pprof" "time" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" "strings" - "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" + "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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/clock" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" diff --git a/flytepropeller/pkg/controller/garbage_collector_test.go b/flytepropeller/pkg/controller/garbage_collector_test.go index e8574352ef..c972bc4c6a 100644 --- a/flytepropeller/pkg/controller/garbage_collector_test.go +++ b/flytepropeller/pkg/controller/garbage_collector_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - config2 "github.com/flyteorg/flytepropeller/pkg/controller/config" + config2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" corev1Types "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flytepropeller/pkg/controller/handler.go b/flytepropeller/pkg/controller/handler.go index 0aac36a04c..35202a9dfd 100644 --- a/flytepropeller/pkg/controller/handler.go +++ b/flytepropeller/pkg/controller/handler.go @@ -10,18 +10,18 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/workflowstore" - - "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" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflowstore" + + "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" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flytepropeller/pkg/controller/handler_test.go b/flytepropeller/pkg/controller/handler_test.go index e81c871bc0..6f30e3d133 100644 --- a/flytepropeller/pkg/controller/handler_test.go +++ b/flytepropeller/pkg/controller/handler_test.go @@ -9,16 +9,16 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - eventErrors "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - workflowErrors "github.com/flyteorg/flytepropeller/pkg/controller/workflow/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/workflowstore" - "github.com/flyteorg/flytepropeller/pkg/controller/workflowstore/mocks" - - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" - storagemocks "github.com/flyteorg/flytestdlib/storage/mocks" + eventErrors "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + workflowErrors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflow/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflowstore" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflowstore/mocks" + + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" + storagemocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/pkg/controller/nodes/array/execution_context.go b/flytepropeller/pkg/controller/nodes/array/execution_context.go index 6731ec55b1..2191b9c7d2 100644 --- a/flytepropeller/pkg/controller/nodes/array/execution_context.go +++ b/flytepropeller/pkg/controller/nodes/array/execution_context.go @@ -3,8 +3,8 @@ package array import ( "strconv" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" ) const ( diff --git a/flytepropeller/pkg/controller/nodes/array/handler.go b/flytepropeller/pkg/controller/nodes/array/handler.go index 7e4c6d1adf..a13c1c7da5 100644 --- a/flytepropeller/pkg/controller/nodes/array/handler.go +++ b/flytepropeller/pkg/controller/nodes/array/handler.go @@ -9,25 +9,25 @@ import ( idlcore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/errorcollector" - - "github.com/flyteorg/flytepropeller/events" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/validators" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/k8s" - - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/errorcollector" + + "github.com/flyteorg/flyte/flytepropeller/events" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/k8s" + + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" ) var ( diff --git a/flytepropeller/pkg/controller/nodes/array/handler_test.go b/flytepropeller/pkg/controller/nodes/array/handler_test.go index 821bcd2d06..7072c0269b 100644 --- a/flytepropeller/pkg/controller/nodes/array/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/array/handler_test.go @@ -8,27 +8,27 @@ import ( idlcore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - eventmocks "github.com/flyteorg/flytepropeller/events/mocks" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - execmocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/catalog" - gatemocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/gate/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - recoverymocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginmocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + eventmocks "github.com/flyteorg/flyte/flytepropeller/events/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + execmocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog" + gatemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + recoverymocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginmocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flytepropeller/pkg/controller/nodes/array/node_execution_context.go b/flytepropeller/pkg/controller/nodes/array/node_execution_context.go index af3ea42f71..1c14ea685f 100644 --- a/flytepropeller/pkg/controller/nodes/array/node_execution_context.go +++ b/flytepropeller/pkg/controller/nodes/array/node_execution_context.go @@ -6,12 +6,12 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" ) type arrayEventRecorder struct { diff --git a/flytepropeller/pkg/controller/nodes/array/node_execution_context_builder.go b/flytepropeller/pkg/controller/nodes/array/node_execution_context_builder.go index de145b95ae..e7ac561e29 100644 --- a/flytepropeller/pkg/controller/nodes/array/node_execution_context_builder.go +++ b/flytepropeller/pkg/controller/nodes/array/node_execution_context_builder.go @@ -3,11 +3,11 @@ package array import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" ) type arrayNodeExecutionContextBuilder struct { diff --git a/flytepropeller/pkg/controller/nodes/array/node_lookup.go b/flytepropeller/pkg/controller/nodes/array/node_lookup.go index b3b8dd03a1..c3817ff2d7 100644 --- a/flytepropeller/pkg/controller/nodes/array/node_lookup.go +++ b/flytepropeller/pkg/controller/nodes/array/node_lookup.go @@ -3,8 +3,8 @@ package array import ( "context" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" ) type arrayNodeLookup struct { diff --git a/flytepropeller/pkg/controller/nodes/array/utils.go b/flytepropeller/pkg/controller/nodes/array/utils.go index a0700e5739..32e5add009 100644 --- a/flytepropeller/pkg/controller/nodes/array/utils.go +++ b/flytepropeller/pkg/controller/nodes/array/utils.go @@ -9,13 +9,13 @@ import ( idlcore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/codex" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/k8s" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/codex" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/k8s" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/golang/protobuf/ptypes" ) diff --git a/flytepropeller/pkg/controller/nodes/branch/comparator.go b/flytepropeller/pkg/controller/nodes/branch/comparator.go index 4fc4f2224f..c659eeac36 100644 --- a/flytepropeller/pkg/controller/nodes/branch/comparator.go +++ b/flytepropeller/pkg/controller/nodes/branch/comparator.go @@ -3,8 +3,8 @@ package branch import ( "reflect" + "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/errors" ) type comparator func(lValue *core.Primitive, rValue *core.Primitive) bool diff --git a/flytepropeller/pkg/controller/nodes/branch/evaluator.go b/flytepropeller/pkg/controller/nodes/branch/evaluator.go index fe6d7edac5..77fd16070c 100644 --- a/flytepropeller/pkg/controller/nodes/branch/evaluator.go +++ b/flytepropeller/pkg/controller/nodes/branch/evaluator.go @@ -3,13 +3,13 @@ package branch import ( "context" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" ) const ErrorCodeUserProvidedError = "UserProvidedError" diff --git a/flytepropeller/pkg/controller/nodes/branch/evaluator_test.go b/flytepropeller/pkg/controller/nodes/branch/evaluator_test.go index 895b731945..b9114f211e 100644 --- a/flytepropeller/pkg/controller/nodes/branch/evaluator_test.go +++ b/flytepropeller/pkg/controller/nodes/branch/evaluator_test.go @@ -5,15 +5,15 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // Creates a ComparisonExpression, comparing 2 literals diff --git a/flytepropeller/pkg/controller/nodes/branch/handler.go b/flytepropeller/pkg/controller/nodes/branch/handler.go index ed73245521..f052f070ce 100644 --- a/flytepropeller/pkg/controller/nodes/branch/handler.go +++ b/flytepropeller/pkg/controller/nodes/branch/handler.go @@ -6,17 +6,17 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - - stdErrors "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type metrics struct { diff --git a/flytepropeller/pkg/controller/nodes/branch/handler_test.go b/flytepropeller/pkg/controller/nodes/branch/handler_test.go index 774c4a4596..7fc64ca2f6 100644 --- a/flytepropeller/pkg/controller/nodes/branch/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/branch/handler_test.go @@ -5,29 +5,29 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + mocks3 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "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" - mocks3 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" v12 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - mocks2 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - execMocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + execMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" ) var eventConfig = &config.EventConfig{ diff --git a/flytepropeller/pkg/controller/nodes/cache.go b/flytepropeller/pkg/controller/nodes/cache.go index dba10c10bb..57a5a70718 100644 --- a/flytepropeller/pkg/controller/nodes/cache.go +++ b/flytepropeller/pkg/controller/nodes/cache.go @@ -8,19 +8,19 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - nodeserrors "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" - - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + nodeserrors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" + + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/pkg/errors" diff --git a/flytepropeller/pkg/controller/nodes/cache_test.go b/flytepropeller/pkg/controller/nodes/cache_test.go index 5a585d0601..2a20c86428 100644 --- a/flytepropeller/pkg/controller/nodes/cache_test.go +++ b/flytepropeller/pkg/controller/nodes/cache_test.go @@ -10,20 +10,20 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - executorsmocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - interfacesmocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - catalogmocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + executorsmocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + interfacesmocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + catalogmocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "k8s.io/apimachinery/pkg/types" diff --git a/flytepropeller/pkg/controller/nodes/catalog/config.go b/flytepropeller/pkg/controller/nodes/catalog/config.go index a77ba6f74a..2d890ec824 100644 --- a/flytepropeller/pkg/controller/nodes/catalog/config.go +++ b/flytepropeller/pkg/controller/nodes/catalog/config.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flytestdlib/config" "google.golang.org/grpc" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/catalog/datacatalog" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog/datacatalog" ) //go:generate pflags Config --default-var defaultConfig diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go index 869d026431..2e3f9fdf6b 100644 --- a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go +++ b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go @@ -6,16 +6,16 @@ import ( "fmt" "time" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" grpcRetry "github.com/grpc-ecosystem/go-grpc-middleware/retry" grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/ptypes" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog_test.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog_test.go index 7243c45dea..a1b82643e1 100644 --- a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog_test.go +++ b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog_test.go @@ -8,17 +8,17 @@ import ( "github.com/flyteorg/flyteidl/clients/go/datacatalog/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" "github.com/golang/protobuf/proto" "github.com/google/uuid" "github.com/pkg/errors" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "google.golang.org/grpc/codes" diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go index c89b8e8e1c..81ae8aa4e6 100644 --- a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go +++ b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/validators" + "github.com/flyteorg/flyte/flytestdlib/pbhash" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flytepropeller/pkg/compiler/validators" - "github.com/flyteorg/flytestdlib/pbhash" ) const cachedTaskTag = "flyte_cached" diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go index 1588d171e0..7415721b73 100644 --- a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go +++ b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go @@ -6,10 +6,10 @@ import ( "strconv" "testing" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go b/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go index 90302c3839..6a0752f9a9 100644 --- a/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go +++ b/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go @@ -4,10 +4,10 @@ import ( "context" "time" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" ) var ( diff --git a/flytepropeller/pkg/controller/nodes/common/utils.go b/flytepropeller/pkg/controller/nodes/common/utils.go index e6a5fb6fdc..a88107638e 100644 --- a/flytepropeller/pkg/controller/nodes/common/utils.go +++ b/flytepropeller/pkg/controller/nodes/common/utils.go @@ -3,10 +3,10 @@ package common import ( "strconv" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" ) const maxUniqueIDLength = 20 diff --git a/flytepropeller/pkg/controller/nodes/common/utils_test.go b/flytepropeller/pkg/controller/nodes/common/utils_test.go index 806f4a0560..f185631617 100644 --- a/flytepropeller/pkg/controller/nodes/common/utils_test.go +++ b/flytepropeller/pkg/controller/nodes/common/utils_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow.go b/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow.go index 4612ab803f..d4972f433c 100644 --- a/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow.go +++ b/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow.go @@ -5,21 +5,21 @@ import ( "fmt" "strconv" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + node_common "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" - "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - node_common "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" - "github.com/flyteorg/flytepropeller/pkg/utils" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" "k8s.io/apimachinery/pkg/util/rand" ) diff --git a/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow_test.go b/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow_test.go index 643535fd58..f6f0b4a1b1 100644 --- a/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow_test.go +++ b/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow_test.go @@ -8,25 +8,25 @@ import ( "github.com/pkg/errors" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" + mocks3 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" + storageMocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" - mocks3 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" - storageMocks "github.com/flyteorg/flytestdlib/storage/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - mocks2 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - mocks4 "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - mocks6 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/dynamic/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - mocks5 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + mocks4 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + mocks6 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/dynamic/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + mocks5 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" ) func Test_dynamicNodeHandler_buildContextualDynamicWorkflow_withLaunchPlans(t *testing.T) { diff --git a/flytepropeller/pkg/controller/nodes/dynamic/handler.go b/flytepropeller/pkg/controller/nodes/dynamic/handler.go index d2c0eb38c1..f26c417d78 100644 --- a/flytepropeller/pkg/controller/nodes/dynamic/handler.go +++ b/flytepropeller/pkg/controller/nodes/dynamic/handler.go @@ -7,22 +7,22 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" - "github.com/flyteorg/flytepropeller/pkg/utils" - - stdErrors "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) //go:generate mockery -all -case=underscore diff --git a/flytepropeller/pkg/controller/nodes/dynamic/handler_test.go b/flytepropeller/pkg/controller/nodes/dynamic/handler_test.go index 980e7601af..5c3b1f0210 100644 --- a/flytepropeller/pkg/controller/nodes/dynamic/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/dynamic/handler_test.go @@ -5,32 +5,32 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" v12 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" - lpMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" + lpMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - flyteMocks "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - executorMocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/dynamic/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - nodeMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + flyteMocks "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + executorMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/dynamic/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + nodeMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" ) type dynamicNodeStateHolder struct { diff --git a/flytepropeller/pkg/controller/nodes/dynamic/mocks/task_node_handler.go b/flytepropeller/pkg/controller/nodes/dynamic/mocks/task_node_handler.go index eeba970481..8d27123b4e 100644 --- a/flytepropeller/pkg/controller/nodes/dynamic/mocks/task_node_handler.go +++ b/flytepropeller/pkg/controller/nodes/dynamic/mocks/task_node_handler.go @@ -5,19 +5,19 @@ package mocks import ( context "context" - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" - handler "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" + handler "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" - ioutils "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + ioutils "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // TaskNodeHandler is an autogenerated mock type for the TaskNodeHandler type diff --git a/flytepropeller/pkg/controller/nodes/dynamic/utils.go b/flytepropeller/pkg/controller/nodes/dynamic/utils.go index 6a38bafe4f..d4fb9dfd1d 100644 --- a/flytepropeller/pkg/controller/nodes/dynamic/utils.go +++ b/flytepropeller/pkg/controller/nodes/dynamic/utils.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" - "github.com/flyteorg/flytepropeller/pkg/compiler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" ) // Constructs the expected interface of a given node. diff --git a/flytepropeller/pkg/controller/nodes/dynamic/utils_test.go b/flytepropeller/pkg/controller/nodes/dynamic/utils_test.go index 291d175ac3..72c65178a6 100644 --- a/flytepropeller/pkg/controller/nodes/dynamic/utils_test.go +++ b/flytepropeller/pkg/controller/nodes/dynamic/utils_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flytepropeller/pkg/controller/nodes/end/handler.go b/flytepropeller/pkg/controller/nodes/end/handler.go index d77a7ab508..1e128ca116 100644 --- a/flytepropeller/pkg/controller/nodes/end/handler.go +++ b/flytepropeller/pkg/controller/nodes/end/handler.go @@ -3,13 +3,13 @@ package end import ( "context" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" ) type endHandler struct { diff --git a/flytepropeller/pkg/controller/nodes/end/handler_test.go b/flytepropeller/pkg/controller/nodes/end/handler_test.go index d1d500d149..ad1c802ec1 100644 --- a/flytepropeller/pkg/controller/nodes/end/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/end/handler_test.go @@ -5,24 +5,24 @@ import ( "fmt" "testing" + mocks2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/proto" regErrors "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - mocks3 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - flyteassert "github.com/flyteorg/flytepropeller/pkg/utils/assert" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + mocks3 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + flyteassert "github.com/flyteorg/flyte/flytepropeller/pkg/utils/assert" ) var testScope = promutils.NewScope("end_test") diff --git a/flytepropeller/pkg/controller/nodes/errors/codes.go b/flytepropeller/pkg/controller/nodes/errors/codes.go index 30ded68b71..a3f877517d 100644 --- a/flytepropeller/pkg/controller/nodes/errors/codes.go +++ b/flytepropeller/pkg/controller/nodes/errors/codes.go @@ -1,6 +1,6 @@ package errors -import "github.com/flyteorg/flytestdlib/errors" +import "github.com/flyteorg/flyte/flytestdlib/errors" type ErrorCode = errors.ErrorCode diff --git a/flytepropeller/pkg/controller/nodes/errors/errors.go b/flytepropeller/pkg/controller/nodes/errors/errors.go index 69a1d63f9b..272158cd85 100644 --- a/flytepropeller/pkg/controller/nodes/errors/errors.go +++ b/flytepropeller/pkg/controller/nodes/errors/errors.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type ErrorMessage = string diff --git a/flytepropeller/pkg/controller/nodes/executor.go b/flytepropeller/pkg/controller/nodes/executor.go index e0bde80dd7..f63130bc89 100644 --- a/flytepropeller/pkg/controller/nodes/executor.go +++ b/flytepropeller/pkg/controller/nodes/executor.go @@ -26,28 +26,28 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytepropeller/events" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - - "github.com/flyteorg/flytestdlib/contextutils" - errors2 "github.com/flyteorg/flytestdlib/errors" - "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/flytepropeller/events" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + + "github.com/flyteorg/flyte/flytestdlib/contextutils" + errors2 "github.com/flyteorg/flyte/flytestdlib/errors" + "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/golang/protobuf/ptypes" diff --git a/flytepropeller/pkg/controller/nodes/executor_test.go b/flytepropeller/pkg/controller/nodes/executor_test.go index a254e94685..71410da34e 100644 --- a/flytepropeller/pkg/controller/nodes/executor_test.go +++ b/flytepropeller/pkg/controller/nodes/executor_test.go @@ -14,32 +14,32 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - pluginscatalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - catalogmocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" - mocks3 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - - "github.com/flyteorg/flytepropeller/events" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - eventMocks "github.com/flyteorg/flytepropeller/events/mocks" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - mocks4 "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/catalog" - gatemocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/gate/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - nodemocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - recoveryMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - flyteassert "github.com/flyteorg/flytepropeller/pkg/utils/assert" - - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" - storageMocks "github.com/flyteorg/flytestdlib/storage/mocks" + pluginscatalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + catalogmocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" + mocks3 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + + "github.com/flyteorg/flyte/flytepropeller/events" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + eventMocks "github.com/flyteorg/flyte/flytepropeller/events/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + mocks4 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog" + gatemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + nodemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + recoveryMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + flyteassert "github.com/flyteorg/flyte/flytepropeller/pkg/utils/assert" + + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" + storageMocks "github.com/flyteorg/flyte/flytestdlib/storage/mocks" "github.com/golang/protobuf/proto" diff --git a/flytepropeller/pkg/controller/nodes/factory/handler_factory.go b/flytepropeller/pkg/controller/nodes/factory/handler_factory.go index 9ec00da7a0..0c8af4f568 100644 --- a/flytepropeller/pkg/controller/nodes/factory/handler_factory.go +++ b/flytepropeller/pkg/controller/nodes/factory/handler_factory.go @@ -5,24 +5,24 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/array" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/branch" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/dynamic" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/end" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/gate" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/start" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/array" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/branch" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/dynamic" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/end" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/start" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/pkg/errors" ) diff --git a/flytepropeller/pkg/controller/nodes/gate/handler.go b/flytepropeller/pkg/controller/nodes/gate/handler.go index 4b8d627209..05e1e3e090 100644 --- a/flytepropeller/pkg/controller/nodes/gate/handler.go +++ b/flytepropeller/pkg/controller/nodes/gate/handler.go @@ -9,15 +9,15 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" ) //go:generate mockery -all -case=underscore diff --git a/flytepropeller/pkg/controller/nodes/gate/handler_test.go b/flytepropeller/pkg/controller/nodes/gate/handler_test.go index b60b9db24b..6680f0105c 100644 --- a/flytepropeller/pkg/controller/nodes/gate/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/gate/handler_test.go @@ -9,20 +9,20 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - flyteMocks "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - executormocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/gate/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - nodeMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + flyteMocks "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + executormocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + nodeMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/flytepropeller/pkg/controller/nodes/handler/state.go b/flytepropeller/pkg/controller/nodes/handler/state.go index 89adfc8f8d..1553e4f63e 100644 --- a/flytepropeller/pkg/controller/nodes/handler/state.go +++ b/flytepropeller/pkg/controller/nodes/handler/state.go @@ -5,12 +5,12 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/bitarray" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/bitarray" + "github.com/flyteorg/flyte/flytestdlib/storage" ) // This is the legacy state structure that gets translated to node status diff --git a/flytepropeller/pkg/controller/nodes/handler/state_test.go b/flytepropeller/pkg/controller/nodes/handler/state_test.go index 7e914422e9..a431ca275a 100644 --- a/flytepropeller/pkg/controller/nodes/handler/state_test.go +++ b/flytepropeller/pkg/controller/nodes/handler/state_test.go @@ -6,7 +6,7 @@ import ( "encoding/gob" "testing" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/k8s" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/k8s" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/handler/transition_info.go b/flytepropeller/pkg/controller/nodes/handler/transition_info.go index 0cce41ef43..1ab8636628 100644 --- a/flytepropeller/pkg/controller/nodes/handler/transition_info.go +++ b/flytepropeller/pkg/controller/nodes/handler/transition_info.go @@ -3,9 +3,9 @@ package handler import ( "time" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytestdlib/storage" ) //go:generate enumer --type=EPhase --trimprefix=EPhase diff --git a/flytepropeller/pkg/controller/nodes/handler/transition_test.go b/flytepropeller/pkg/controller/nodes/handler/transition_test.go index 61236531fc..76b689acf3 100644 --- a/flytepropeller/pkg/controller/nodes/handler/transition_test.go +++ b/flytepropeller/pkg/controller/nodes/handler/transition_test.go @@ -5,7 +5,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/handler.go b/flytepropeller/pkg/controller/nodes/interfaces/handler.go index 5cf82a27aa..c5fe9d6321 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/handler.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/handler.go @@ -3,10 +3,10 @@ package interfaces import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) //go:generate mockery -all -case=underscore diff --git a/flytepropeller/pkg/controller/nodes/interfaces/handler_factory.go b/flytepropeller/pkg/controller/nodes/interfaces/handler_factory.go index a323d8bf85..df3395f851 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/handler_factory.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/handler_factory.go @@ -3,7 +3,7 @@ package interfaces import ( "context" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) //go:generate mockery -name HandlerFactory -case=underscore diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/cacheable_node_handler.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/cacheable_node_handler.go index 39456010ba..8de2c631d9 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/cacheable_node_handler.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/cacheable_node_handler.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - catalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + catalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" - handler "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" + handler "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/event_recorder.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/event_recorder.go index 684419825b..ea3dbf0535 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/event_recorder.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/event_recorder.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - config "github.com/flyteorg/flytepropeller/pkg/controller/config" + config "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" event "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/handler_factory.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/handler_factory.go index ca851495f9..bfd15341ce 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/handler_factory.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/handler_factory.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // HandlerFactory is an autogenerated mock type for the HandlerFactory type diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node.go index 0413f7ebcb..8552938f02 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node.go @@ -5,14 +5,14 @@ package mocks import ( context "context" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // Node is an autogenerated mock type for the Node type diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context.go index fcf130e304..448b5aa13f 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context.go @@ -3,18 +3,18 @@ package mocks import ( - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" - io "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + io "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" - ioutils "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + ioutils "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // NodeExecutionContext is an autogenerated mock type for the NodeExecutionContext type diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context_builder.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context_builder.go index d068f19025..7b18c4e6ea 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context_builder.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_execution_context_builder.go @@ -5,8 +5,8 @@ package mocks import ( context "context" - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_executor.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_executor.go index e619c8fd70..e01d13d7d4 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_executor.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_executor.go @@ -5,8 +5,8 @@ package mocks import ( context "context" - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_handler.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_handler.go index 66bd61d27d..052d0eb3ca 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_handler.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_handler.go @@ -5,8 +5,8 @@ package mocks import ( context "context" - handler "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - interfaces "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + handler "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + interfaces "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_reader.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_reader.go index 853eb5b674..f2b5fc6a56 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_reader.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_reader.go @@ -3,7 +3,7 @@ package mocks import ( - handler "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" + handler "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_writer.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_writer.go index 46c0e2a383..7be0d5eda1 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_writer.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/node_state_writer.go @@ -3,7 +3,7 @@ package mocks import ( - handler "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" + handler "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/mocks/setup_context.go b/flytepropeller/pkg/controller/nodes/interfaces/mocks/setup_context.go index 47a7e655f5..f809bce7c3 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/mocks/setup_context.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/mocks/setup_context.go @@ -3,7 +3,7 @@ package mocks import ( - promutils "github.com/flyteorg/flytestdlib/promutils" + promutils "github.com/flyteorg/flyte/flytestdlib/promutils" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/interfaces/node.go b/flytepropeller/pkg/controller/nodes/interfaces/node.go index 7196897411..b5145bcafc 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/node.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/node.go @@ -6,8 +6,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" ) //go:generate mockery -all -case=underscore diff --git a/flytepropeller/pkg/controller/nodes/interfaces/node_exec_context.go b/flytepropeller/pkg/controller/nodes/interfaces/node_exec_context.go index fa9d32388e..3e7b93d2d2 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/node_exec_context.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/node_exec_context.go @@ -5,14 +5,14 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flytepropeller/events" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/events" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/flytepropeller/pkg/controller/nodes/interfaces/state.go b/flytepropeller/pkg/controller/nodes/interfaces/state.go index bdbcad2e1e..65f56536d8 100644 --- a/flytepropeller/pkg/controller/nodes/interfaces/state.go +++ b/flytepropeller/pkg/controller/nodes/interfaces/state.go @@ -1,7 +1,7 @@ package interfaces import ( - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" ) type NodeStateWriter interface { diff --git a/flytepropeller/pkg/controller/nodes/mocks/output_resolver.go b/flytepropeller/pkg/controller/nodes/mocks/output_resolver.go index 51a7028001..66a8ec588f 100644 --- a/flytepropeller/pkg/controller/nodes/mocks/output_resolver.go +++ b/flytepropeller/pkg/controller/nodes/mocks/output_resolver.go @@ -5,12 +5,12 @@ package mocks import ( context "context" + executors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) // OutputResolver is an autogenerated mock type for the OutputResolver type diff --git a/flytepropeller/pkg/controller/nodes/node_exec_context.go b/flytepropeller/pkg/controller/nodes/node_exec_context.go index 2579fdbe3e..fff6c77f67 100644 --- a/flytepropeller/pkg/controller/nodes/node_exec_context.go +++ b/flytepropeller/pkg/controller/nodes/node_exec_context.go @@ -8,20 +8,20 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - - "github.com/flyteorg/flytepropeller/events" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - nodeerrors "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/utils" - - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + + "github.com/flyteorg/flyte/flytepropeller/events" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + nodeerrors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/pkg/errors" diff --git a/flytepropeller/pkg/controller/nodes/node_exec_context_test.go b/flytepropeller/pkg/controller/nodes/node_exec_context_test.go index 707ce33f4c..c42328be56 100644 --- a/flytepropeller/pkg/controller/nodes/node_exec_context_test.go +++ b/flytepropeller/pkg/controller/nodes/node_exec_context_test.go @@ -10,19 +10,19 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytepropeller/events" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/node_state_manager.go b/flytepropeller/pkg/controller/nodes/node_state_manager.go index 7a961fed54..589a3c3a8e 100644 --- a/flytepropeller/pkg/controller/nodes/node_state_manager.go +++ b/flytepropeller/pkg/controller/nodes/node_state_manager.go @@ -3,10 +3,10 @@ package nodes import ( "context" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" ) type nodeStateManager struct { diff --git a/flytepropeller/pkg/controller/nodes/output_resolver.go b/flytepropeller/pkg/controller/nodes/output_resolver.go index 219ca09fed..6fc7b0032b 100644 --- a/flytepropeller/pkg/controller/nodes/output_resolver.go +++ b/flytepropeller/pkg/controller/nodes/output_resolver.go @@ -4,15 +4,15 @@ import ( "context" "reflect" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type VarName = string diff --git a/flytepropeller/pkg/controller/nodes/output_resolver_test.go b/flytepropeller/pkg/controller/nodes/output_resolver_test.go index c670b03817..dc949fb3ce 100644 --- a/flytepropeller/pkg/controller/nodes/output_resolver_test.go +++ b/flytepropeller/pkg/controller/nodes/output_resolver_test.go @@ -3,8 +3,8 @@ package nodes import ( "testing" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/predicate.go b/flytepropeller/pkg/controller/nodes/predicate.go index d0a766bfaa..5ce24bf926 100644 --- a/flytepropeller/pkg/controller/nodes/predicate.go +++ b/flytepropeller/pkg/controller/nodes/predicate.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" ) // Special enum to indicate if the node under consideration is ready to be executed or should be skipped diff --git a/flytepropeller/pkg/controller/nodes/predicate_test.go b/flytepropeller/pkg/controller/nodes/predicate_test.go index e998e8ca17..3498ccd2c9 100644 --- a/flytepropeller/pkg/controller/nodes/predicate_test.go +++ b/flytepropeller/pkg/controller/nodes/predicate_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/resolve.go b/flytepropeller/pkg/controller/nodes/resolve.go index 4ad66c955e..7f967b4fba 100644 --- a/flytepropeller/pkg/controller/nodes/resolve.go +++ b/flytepropeller/pkg/controller/nodes/resolve.go @@ -3,11 +3,11 @@ package nodes import ( "context" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytestdlib/logger" ) func ResolveBindingData(ctx context.Context, outputResolver OutputResolver, nl executors.NodeLookup, bindingData *core.BindingData) (*core.Literal, error) { diff --git a/flytepropeller/pkg/controller/nodes/resolve_test.go b/flytepropeller/pkg/controller/nodes/resolve_test.go index 533e0ebfd7..d8d0ad8add 100644 --- a/flytepropeller/pkg/controller/nodes/resolve_test.go +++ b/flytepropeller/pkg/controller/nodes/resolve_test.go @@ -4,20 +4,20 @@ import ( "context" "testing" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/utils" - flyteassert "github.com/flyteorg/flytepropeller/pkg/utils/assert" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + flyteassert "github.com/flyteorg/flyte/flytepropeller/pkg/utils/assert" ) var testScope = promutils.NewScope("test") diff --git a/flytepropeller/pkg/controller/nodes/setup_context.go b/flytepropeller/pkg/controller/nodes/setup_context.go index d398637633..c4fdab9897 100644 --- a/flytepropeller/pkg/controller/nodes/setup_context.go +++ b/flytepropeller/pkg/controller/nodes/setup_context.go @@ -3,10 +3,10 @@ package nodes import ( "context" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" ) type setupContext struct { diff --git a/flytepropeller/pkg/controller/nodes/start/handler.go b/flytepropeller/pkg/controller/nodes/start/handler.go index a8535b8fd9..86e136554e 100644 --- a/flytepropeller/pkg/controller/nodes/start/handler.go +++ b/flytepropeller/pkg/controller/nodes/start/handler.go @@ -3,8 +3,8 @@ package start import ( "context" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" ) type startHandler struct { diff --git a/flytepropeller/pkg/controller/nodes/start/handler_test.go b/flytepropeller/pkg/controller/nodes/start/handler_test.go index 238b143dc0..03260179f1 100644 --- a/flytepropeller/pkg/controller/nodes/start/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/start/handler_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" ) func init() { diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/handler.go b/flytepropeller/pkg/controller/nodes/subworkflow/handler.go index 5f478e3986..be99894c84 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/handler.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/handler.go @@ -3,21 +3,21 @@ package subworkflow import ( "context" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" ) type workflowNodeHandler struct { diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/handler_test.go b/flytepropeller/pkg/controller/nodes/subworkflow/handler_test.go index 20e40fdc03..44108361ef 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/handler_test.go @@ -6,29 +6,29 @@ import ( "reflect" "testing" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - mocks5 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery/mocks" + mocks5 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery/mocks" + mocks4 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "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/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - mocks4 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - mocks2 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - execMocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - mocks3 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + execMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + mocks3 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" ) type workflowNodeStateHolder struct { diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan.go index d265d03dbb..7d4fbb9ab0 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan.go @@ -6,17 +6,17 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go index 574464a1c4..517ac707dc 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go @@ -9,12 +9,12 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytestdlib/cache" - stdErr "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/cache" + stdErr "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" - evtErr "github.com/flyteorg/flytepropeller/events/errors" + evtErr "github.com/flyteorg/flyte/flytepropeller/events/errors" "github.com/golang/protobuf/ptypes/wrappers" diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin_test.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin_test.go index 3f86646ad0..f53072a163 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin_test.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin_test.go @@ -7,10 +7,10 @@ import ( "github.com/golang/protobuf/proto" - "github.com/flyteorg/flytestdlib/cache" - mocks2 "github.com/flyteorg/flytestdlib/cache/mocks" + "github.com/flyteorg/flyte/flytestdlib/cache" + mocks2 "github.com/flyteorg/flyte/flytestdlib/cache/mocks" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/adminconfig.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/adminconfig.go index a88a96b30d..ffb14e3182 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/adminconfig.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/adminconfig.go @@ -1,7 +1,7 @@ package launchplan import ( - ctrlConfig "github.com/flyteorg/flytepropeller/pkg/controller/config" + ctrlConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" ) //go:generate pflags AdminConfig --default-var defaultAdminConfig diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors.go index af4d691a79..743f403017 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors.go @@ -1,7 +1,7 @@ package launchplan import ( - errors2 "github.com/flyteorg/flytestdlib/errors" + errors2 "github.com/flyteorg/flyte/flytestdlib/errors" ) type ErrorCode = errors2.ErrorCode diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors_test.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors_test.go index 53a9eda7e0..8e436cc17b 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors_test.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/errors_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/executor.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/executor.go index 5809acab50..be0baaa49d 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/executor.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/executor.go @@ -9,7 +9,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - launchplan "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + launchplan "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/flyte_admin.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/flyte_admin.go index 48c8074d6e..f754707ad8 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/flyte_admin.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks/flyte_admin.go @@ -9,7 +9,7 @@ import ( core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - launchplan "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + launchplan "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" mock "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/noop.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/noop.go index 6a1799cfe1..51bf8e6423 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/noop.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/noop.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" + "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/flytestdlib/logger" ) type failFastWorkflowLauncher struct { diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan_test.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan_test.go index 96e50280ec..f6042dcb57 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan_test.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan_test.go @@ -6,29 +6,29 @@ import ( "reflect" "testing" - mocks4 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - mocks3 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" + mocks4 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + mocks3 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/flyteorg/flyteidl/clients/go/coreutils" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - mocks2 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - execMocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - recoveryMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" - "github.com/flyteorg/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + execMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + recoveryMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" ) func createInmemoryStore(t testing.TB) *storage.DataStore { diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow.go b/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow.go index d0dad95b9d..9c088b10c3 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow.go @@ -6,16 +6,16 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" ) // Subworkflow handler handles inline subWorkflows diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow_test.go b/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow_test.go index def32c198d..d8fb93d247 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow_test.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/subworkflow_test.go @@ -5,15 +5,15 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - coreMocks "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - execMocks "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" + coreMocks "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + execMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" ) func TestGetSubWorkflow(t *testing.T) { diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/util.go b/flytepropeller/pkg/controller/nodes/subworkflow/util.go index 9eed0c8a5a..1bc690f15d 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/util.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/util.go @@ -5,7 +5,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" ) const maxLengthForSubWorkflow = 20 diff --git a/flytepropeller/pkg/controller/nodes/task/backoff/controller.go b/flytepropeller/pkg/controller/nodes/task/backoff/controller.go index 475f817d85..89faff559a 100644 --- a/flytepropeller/pkg/controller/nodes/task/backoff/controller.go +++ b/flytepropeller/pkg/controller/nodes/task/backoff/controller.go @@ -7,9 +7,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - stdAtomic "github.com/flyteorg/flytestdlib/atomic" + stdAtomic "github.com/flyteorg/flyte/flytestdlib/atomic" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "k8s.io/apimachinery/pkg/util/clock" ) diff --git a/flytepropeller/pkg/controller/nodes/task/backoff/handler.go b/flytepropeller/pkg/controller/nodes/task/backoff/handler.go index d27400a175..8decfa09eb 100644 --- a/flytepropeller/pkg/controller/nodes/task/backoff/handler.go +++ b/flytepropeller/pkg/controller/nodes/task/backoff/handler.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - stdAtomic "github.com/flyteorg/flytestdlib/atomic" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + stdAtomic "github.com/flyteorg/flyte/flytestdlib/atomic" + "github.com/flyteorg/flyte/flytestdlib/logger" v1 "k8s.io/api/core/v1" apiErrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/flytepropeller/pkg/controller/nodes/task/backoff/handler_test.go b/flytepropeller/pkg/controller/nodes/task/backoff/handler_test.go index 5167beceea..a164348b46 100644 --- a/flytepropeller/pkg/controller/nodes/task/backoff/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/task/backoff/handler_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - stdAtomic "github.com/flyteorg/flytestdlib/atomic" + stdAtomic "github.com/flyteorg/flyte/flytestdlib/atomic" "github.com/stretchr/testify/assert" - taskErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - stdlibErrors "github.com/flyteorg/flytestdlib/errors" + taskErrors "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + stdlibErrors "github.com/flyteorg/flyte/flytestdlib/errors" v1 "k8s.io/api/core/v1" apiErrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/flytepropeller/pkg/controller/nodes/task/cache.go b/flytepropeller/pkg/controller/nodes/task/cache.go index 479a49c5b3..865d2b005d 100644 --- a/flytepropeller/pkg/controller/nodes/task/cache.go +++ b/flytepropeller/pkg/controller/nodes/task/cache.go @@ -3,14 +3,14 @@ package task import ( "context" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" - errors2 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + errors2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/logger" ) func (t *Handler) GetCatalogKey(ctx context.Context, nCtx interfaces.NodeExecutionContext) (catalog.Key, error) { diff --git a/flytepropeller/pkg/controller/nodes/task/config/config.go b/flytepropeller/pkg/controller/nodes/task/config/config.go index 0207956755..26373219d4 100644 --- a/flytepropeller/pkg/controller/nodes/task/config/config.go +++ b/flytepropeller/pkg/controller/nodes/task/config/config.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config diff --git a/flytepropeller/pkg/controller/nodes/task/event_recorder.go b/flytepropeller/pkg/controller/nodes/task/event_recorder.go index 1180370e45..efcd0843af 100644 --- a/flytepropeller/pkg/controller/nodes/task/event_recorder.go +++ b/flytepropeller/pkg/controller/nodes/task/event_recorder.go @@ -3,7 +3,7 @@ package task import ( "context" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) type bufferedEventRecorder struct { diff --git a/flytepropeller/pkg/controller/nodes/task/event_recorder_test.go b/flytepropeller/pkg/controller/nodes/task/event_recorder_test.go index 2866566ba2..3d8b608cc3 100644 --- a/flytepropeller/pkg/controller/nodes/task/event_recorder_test.go +++ b/flytepropeller/pkg/controller/nodes/task/event_recorder_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/task/fakeplugins/next_phase_state_plugin.go b/flytepropeller/pkg/controller/nodes/task/fakeplugins/next_phase_state_plugin.go index 5e68c9729e..6f93028d15 100644 --- a/flytepropeller/pkg/controller/nodes/task/fakeplugins/next_phase_state_plugin.go +++ b/flytepropeller/pkg/controller/nodes/task/fakeplugins/next_phase_state_plugin.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/task/fakeplugins/task_replayer_plugin.go b/flytepropeller/pkg/controller/nodes/task/fakeplugins/task_replayer_plugin.go index 4956b92525..922bd26dde 100644 --- a/flytepropeller/pkg/controller/nodes/task/fakeplugins/task_replayer_plugin.go +++ b/flytepropeller/pkg/controller/nodes/task/fakeplugins/task_replayer_plugin.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) type HandleResponse struct { diff --git a/flytepropeller/pkg/controller/nodes/task/future_file_reader.go b/flytepropeller/pkg/controller/nodes/task/future_file_reader.go index c05fdea092..04dbef90ae 100644 --- a/flytepropeller/pkg/controller/nodes/task/future_file_reader.go +++ b/flytepropeller/pkg/controller/nodes/task/future_file_reader.go @@ -3,13 +3,13 @@ package task import ( "context" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" ) // TODO this file exists only until we need to support dynamic nodes instead of closure. diff --git a/flytepropeller/pkg/controller/nodes/task/handler.go b/flytepropeller/pkg/controller/nodes/task/handler.go index 600b67076e..cfe0967919 100644 --- a/flytepropeller/pkg/controller/nodes/task/handler.go +++ b/flytepropeller/pkg/controller/nodes/task/handler.go @@ -10,31 +10,31 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - pluginMachinery "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - pluginK8s "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - controllerConfig "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager" - rmConfig "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/secretmanager" - "github.com/flyteorg/flytepropeller/pkg/utils" - - "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" + pluginMachinery "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + pluginK8s "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + controllerConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager" + rmConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/secretmanager" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + + "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" "github.com/golang/protobuf/ptypes" diff --git a/flytepropeller/pkg/controller/nodes/task/handler_test.go b/flytepropeller/pkg/controller/nodes/task/handler_test.go index 38506c4c75..6638caa2b5 100644 --- a/flytepropeller/pkg/controller/nodes/task/handler_test.go +++ b/flytepropeller/pkg/controller/nodes/task/handler_test.go @@ -9,47 +9,47 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/golang/protobuf/proto" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" - pluginK8sMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s/mocks" + pluginK8sMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginCatalogMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + pluginK8s "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + controllerConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginCatalogMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - pluginK8s "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - controllerConfig "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - flyteMocks "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - nodeMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/codex" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/fakeplugins" - rmConfig "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" + flyteMocks "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + nodeMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/codex" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/fakeplugins" + rmConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" ) var eventConfig = &controllerConfig.EventConfig{ diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector.go b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector.go index 51c779a2df..138444d4cb 100644 --- a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector.go +++ b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector.go @@ -7,14 +7,14 @@ import ( "sync" "time" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) const resourceLevelMonitorCycleDuration = 10 * time.Second diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector_test.go b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector_test.go index b9ae3688af..aad8456fd0 100644 --- a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector_test.go +++ b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_collector_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_context.go b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_context.go index aed5bc468f..ceb6f02496 100644 --- a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_context.go +++ b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_context.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flytestdlib/logger" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flytestdlib/logger" ) var _ k8s.PluginContext = &pluginContext{} diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager.go b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager.go index a3397354e7..a849e1e105 100644 --- a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager.go +++ b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager.go @@ -6,23 +6,23 @@ import ( "reflect" "time" - "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - - compiler "github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/backoff" - nodeTaskConfig "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/config" - - "github.com/flyteorg/flytestdlib/contextutils" - stdErrors "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + + compiler "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/backoff" + nodeTaskConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/config" + + "github.com/flyteorg/flyte/flytestdlib/contextutils" + stdErrors "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "golang.org/x/time/rate" diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager_test.go b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager_test.go index 7b78c68108..4871f0aa9c 100644 --- a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager_test.go +++ b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager_test.go @@ -9,23 +9,23 @@ import ( "k8s.io/client-go/kubernetes/scheme" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/backoff" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" + + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/backoff" + "github.com/flyteorg/flyte/flytestdlib/promutils" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - pluginsCoreMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" - pluginsk8sMock "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s/mocks" + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCoreMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" + pluginsk8sMock "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s/mocks" "github.com/stretchr/testify/mock" v1 "k8s.io/api/core/v1" @@ -37,7 +37,7 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" ) type extendedFakeClient struct { diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context.go b/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context.go index 21171fbdb9..fa5c25edf1 100644 --- a/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context.go +++ b/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context.go @@ -1,10 +1,10 @@ package k8s import ( + pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils/secrets" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils/secrets" ) // TaskExecutionContext provides a layer on top of core TaskExecutionContext with a custom TaskExecutionMetadata. diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context_test.go b/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context_test.go index 24836bd4f1..79a04fea5c 100644 --- a/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context_test.go +++ b/flytepropeller/pkg/controller/nodes/task/k8s/task_exec_context_test.go @@ -3,8 +3,8 @@ package k8s import ( "testing" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/task/plugin_config.go b/flytepropeller/pkg/controller/nodes/task/plugin_config.go index 07f6d3a7a4..0fefd3e080 100644 --- a/flytepropeller/pkg/controller/nodes/task/plugin_config.go +++ b/flytepropeller/pkg/controller/nodes/task/plugin_config.go @@ -6,14 +6,14 @@ import ( "strings" "sync" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/backoff" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/backoff" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flyteplugins/go/tasks/plugins/webapi/agent" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/webapi/agent" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/k8s" ) var once sync.Once diff --git a/flytepropeller/pkg/controller/nodes/task/plugin_config_test.go b/flytepropeller/pkg/controller/nodes/task/plugin_config_test.go index 2dbf9f31c8..0e415ac1cd 100644 --- a/flytepropeller/pkg/controller/nodes/task/plugin_config_test.go +++ b/flytepropeller/pkg/controller/nodes/task/plugin_config_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - config2 "github.com/flyteorg/flytestdlib/config" + config2 "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/k8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/k8s" "github.com/magiconair/properties/assert" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/config" ) func TestWranglePluginsAndGenerateFinalList(t *testing.T) { diff --git a/flytepropeller/pkg/controller/nodes/task/plugin_state_manager.go b/flytepropeller/pkg/controller/nodes/task/plugin_state_manager.go index f68d7b58aa..3613fec916 100644 --- a/flytepropeller/pkg/controller/nodes/task/plugin_state_manager.go +++ b/flytepropeller/pkg/controller/nodes/task/plugin_state_manager.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/codex" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/codex" ) type CodecVersion uint8 diff --git a/flytepropeller/pkg/controller/nodes/task/remote_workflow_store.go b/flytepropeller/pkg/controller/nodes/task/remote_workflow_store.go index 49abe98b6e..b62a3a922d 100644 --- a/flytepropeller/pkg/controller/nodes/task/remote_workflow_store.go +++ b/flytepropeller/pkg/controller/nodes/task/remote_workflow_store.go @@ -7,11 +7,11 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/pkg/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type RemoteFileWorkflowStore struct { diff --git a/flytepropeller/pkg/controller/nodes/task/remote_workflow_store_test.go b/flytepropeller/pkg/controller/nodes/task/remote_workflow_store_test.go index addda2bbd0..fb0a76a3c1 100644 --- a/flytepropeller/pkg/controller/nodes/task/remote_workflow_store_test.go +++ b/flytepropeller/pkg/controller/nodes/task/remote_workflow_store_test.go @@ -12,12 +12,12 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) func createInmemoryStore(t testing.TB) *storage.DataStore { diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/config/config.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/config/config.go index 22e6a279c0..5a92d3c8e8 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/config/config.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/noop_resourcemanager.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/noop_resourcemanager.go index cc1e86b8e5..9b151af3bf 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/noop_resourcemanager.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/noop_resourcemanager.go @@ -3,7 +3,7 @@ package resourcemanager import ( "context" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" ) const NoopResourceManagerID = "noopresourcemanager" diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_client.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_client.go index 6a7ab61160..ba6d1df6f9 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_client.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_client.go @@ -3,9 +3,9 @@ package resourcemanager import ( "context" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/go-redis/redis" ) diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager.go index e1ae2abb62..465c24b881 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager.go @@ -6,10 +6,10 @@ import ( "sync" "time" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - rmConfig "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + rmConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "k8s.io/apimachinery/pkg/util/wait" diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager_test.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager_test.go index d80134d062..f0e3eb8cee 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager_test.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/redis_resourcemanager_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager/mocks" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager/mocks" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourceconstraints.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourceconstraints.go index fe9dd33243..550da01f84 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourceconstraints.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourceconstraints.go @@ -1,8 +1,8 @@ package resourcemanager import ( + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" ) type ResourceConstraint interface { diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager.go index e896b9f0e5..dfd7f58ade 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager.go @@ -9,8 +9,8 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/promutils" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type TokenPrefix string diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_test.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_test.go index 137223cb3d..06edb3c12d 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_test.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" + core2 "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + rmConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - core2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - rmConfig "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" - "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_util.go b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_util.go index bfbd38ffaf..15c3ddfa9f 100644 --- a/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_util.go +++ b/flytepropeller/pkg/controller/nodes/task/resourcemanager/resourcemanager_util.go @@ -3,9 +3,9 @@ package resourcemanager import ( "context" - rmConfig "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + rmConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager/config" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) const ( diff --git a/flytepropeller/pkg/controller/nodes/task/secretmanager/config.go b/flytepropeller/pkg/controller/nodes/task/secretmanager/config.go index d0ed8bf143..c4c694a308 100644 --- a/flytepropeller/pkg/controller/nodes/task/secretmanager/config.go +++ b/flytepropeller/pkg/controller/nodes/task/secretmanager/config.go @@ -1,6 +1,6 @@ package secretmanager -import "github.com/flyteorg/flytestdlib/config" +import "github.com/flyteorg/flyte/flytestdlib/config" //go:generate pflags Config --default-var defaultConfig diff --git a/flytepropeller/pkg/controller/nodes/task/secretmanager/secrets.go b/flytepropeller/pkg/controller/nodes/task/secretmanager/secrets.go index e097ed9af8..f70a9ec915 100644 --- a/flytepropeller/pkg/controller/nodes/task/secretmanager/secrets.go +++ b/flytepropeller/pkg/controller/nodes/task/secretmanager/secrets.go @@ -10,7 +10,7 @@ import ( coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) // Env Var Lookup based on Prefix + SecretGroup + _ + SecretKey diff --git a/flytepropeller/pkg/controller/nodes/task/setup_ctx.go b/flytepropeller/pkg/controller/nodes/task/setup_ctx.go index 4277275a26..97790c0f98 100644 --- a/flytepropeller/pkg/controller/nodes/task/setup_ctx.go +++ b/flytepropeller/pkg/controller/nodes/task/setup_ctx.go @@ -1,11 +1,11 @@ package task import ( - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/apimachinery/pkg/types" ) diff --git a/flytepropeller/pkg/controller/nodes/task/setup_ctx_test.go b/flytepropeller/pkg/controller/nodes/task/setup_ctx_test.go index e987bbb244..bfb32ac8c9 100644 --- a/flytepropeller/pkg/controller/nodes/task/setup_ctx_test.go +++ b/flytepropeller/pkg/controller/nodes/task/setup_ctx_test.go @@ -3,9 +3,9 @@ package task import ( "testing" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/nodes/task/taskexec_context.go b/flytepropeller/pkg/controller/nodes/task/taskexec_context.go index a308647ac0..68965e2bf3 100644 --- a/flytepropeller/pkg/controller/nodes/task/taskexec_context.go +++ b/flytepropeller/pkg/controller/nodes/task/taskexec_context.go @@ -6,20 +6,20 @@ import ( "strconv" "strings" + pluginCatalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCatalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager" - "github.com/flyteorg/flytepropeller/pkg/utils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/flytepropeller/pkg/controller/nodes/task/taskexec_context_test.go b/flytepropeller/pkg/controller/nodes/task/taskexec_context_test.go index cd30e86b5a..b6630dc315 100644 --- a/flytepropeller/pkg/controller/nodes/task/taskexec_context_test.go +++ b/flytepropeller/pkg/controller/nodes/task/taskexec_context_test.go @@ -5,35 +5,35 @@ import ( "context" "testing" - "github.com/flyteorg/flytepropeller/pkg/utils" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" "k8s.io/apimachinery/pkg/api/resource" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/resourcemanager" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/resourcemanager" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" + pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" - pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - ioMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - flyteMocks "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - nodeMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/codex" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/secretmanager" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + flyteMocks "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + nodeMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/codex" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/secretmanager" ) func TestHandler_newTaskExecutionContext(t *testing.T) { diff --git a/flytepropeller/pkg/controller/nodes/task/transformer.go b/flytepropeller/pkg/controller/nodes/task/transformer.go index 21edca7231..78eb7aa33d 100644 --- a/flytepropeller/pkg/controller/nodes/task/transformer.go +++ b/flytepropeller/pkg/controller/nodes/task/transformer.go @@ -3,16 +3,16 @@ package task import ( "time" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" "github.com/golang/protobuf/ptypes" timestamppb "github.com/golang/protobuf/ptypes/timestamp" diff --git a/flytepropeller/pkg/controller/nodes/task/transformer_test.go b/flytepropeller/pkg/controller/nodes/task/transformer_test.go index d9400336ec..b12342ddf3 100644 --- a/flytepropeller/pkg/controller/nodes/task/transformer_test.go +++ b/flytepropeller/pkg/controller/nodes/task/transformer_test.go @@ -7,24 +7,24 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/golang/protobuf/proto" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" - "github.com/flyteorg/flytestdlib/storage" "github.com/golang/protobuf/ptypes" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/stretchr/testify/assert" - pluginMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - nodemocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" + pluginMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + nodemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" ) const containerTaskType = "container" diff --git a/flytepropeller/pkg/controller/nodes/task_reader.go b/flytepropeller/pkg/controller/nodes/task_reader.go index f93a7d70b0..b2cbba7371 100644 --- a/flytepropeller/pkg/controller/nodes/task_reader.go +++ b/flytepropeller/pkg/controller/nodes/task_reader.go @@ -5,7 +5,7 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type taskReader struct { diff --git a/flytepropeller/pkg/controller/nodes/transformers.go b/flytepropeller/pkg/controller/nodes/transformers.go index 07253894f8..8cb5ad5022 100644 --- a/flytepropeller/pkg/controller/nodes/transformers.go +++ b/flytepropeller/pkg/controller/nodes/transformers.go @@ -9,14 +9,14 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/common" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/common" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/ptypes" diff --git a/flytepropeller/pkg/controller/nodes/transformers_test.go b/flytepropeller/pkg/controller/nodes/transformers_test.go index a355a8f27e..ebd3e44679 100644 --- a/flytepropeller/pkg/controller/nodes/transformers_test.go +++ b/flytepropeller/pkg/controller/nodes/transformers_test.go @@ -6,15 +6,15 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/golang/protobuf/proto" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - "github.com/flyteorg/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/workers.go b/flytepropeller/pkg/controller/workers.go index 62777dcf59..9b3f8555d3 100644 --- a/flytepropeller/pkg/controller/workers.go +++ b/flytepropeller/pkg/controller/workers.go @@ -6,9 +6,9 @@ import ( "runtime/pprof" "time" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" diff --git a/flytepropeller/pkg/controller/workers_test.go b/flytepropeller/pkg/controller/workers_test.go index db0236a9fd..c3c271e7a0 100644 --- a/flytepropeller/pkg/controller/workers_test.go +++ b/flytepropeller/pkg/controller/workers_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/workflow/errors/errors.go b/flytepropeller/pkg/controller/workflow/errors/errors.go index 1905cbfbc2..1c84f3045e 100644 --- a/flytepropeller/pkg/controller/workflow/errors/errors.go +++ b/flytepropeller/pkg/controller/workflow/errors/errors.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) type ErrorMessage = string diff --git a/flytepropeller/pkg/controller/workflow/executor.go b/flytepropeller/pkg/controller/workflow/executor.go index 9f86dea139..4b15b25111 100644 --- a/flytepropeller/pkg/controller/workflow/executor.go +++ b/flytepropeller/pkg/controller/workflow/executor.go @@ -8,19 +8,19 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" - "github.com/flyteorg/flytepropeller/events" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/executors" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces" - "github.com/flyteorg/flytepropeller/pkg/controller/workflow/errors" - "github.com/flyteorg/flytepropeller/pkg/utils" - - "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/flytepropeller/events" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflow/errors" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + + "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" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" diff --git a/flytepropeller/pkg/controller/workflow/executor_test.go b/flytepropeller/pkg/controller/workflow/executor_test.go index 6633b11b49..ca4ffcc88f 100644 --- a/flytepropeller/pkg/controller/workflow/executor_test.go +++ b/flytepropeller/pkg/controller/workflow/executor_test.go @@ -16,45 +16,45 @@ import ( "github.com/flyteorg/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/stretchr/testify/mock" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" - pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - "github.com/flyteorg/flytestdlib/logger" - - "github.com/flyteorg/flytepropeller/events" - eventsErr "github.com/flyteorg/flytepropeller/events/errors" - eventMocks "github.com/flyteorg/flytepropeller/events/mocks" - mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/executors/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/catalog" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/factory" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/handler" - nodemocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/interfaces/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/fakeplugins" - - wfErrors "github.com/flyteorg/flytepropeller/pkg/controller/workflow/errors" - + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" + pluginCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + + "github.com/flyteorg/flyte/flytepropeller/events" + eventsErr "github.com/flyteorg/flyte/flytepropeller/events/errors" + eventMocks "github.com/flyteorg/flyte/flytepropeller/events/mocks" + mocks2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/factory" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler" + nodemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/fakeplugins" + + wfErrors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflow/errors" + + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/yamlutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/storage" - "github.com/flyteorg/flytestdlib/yamlutils" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" "k8s.io/client-go/tools/record" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes" - gatemocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/gate/mocks" - recoveryMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery/mocks" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes" + gatemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate/mocks" + recoveryMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan" ) var ( diff --git a/flytepropeller/pkg/controller/workflowstore/config.go b/flytepropeller/pkg/controller/workflowstore/config.go index 8f4f96477f..1cd76b4b62 100644 --- a/flytepropeller/pkg/controller/workflowstore/config.go +++ b/flytepropeller/pkg/controller/workflowstore/config.go @@ -1,7 +1,7 @@ package workflowstore import ( - ctrlConfig "github.com/flyteorg/flytepropeller/pkg/controller/config" + ctrlConfig "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flytepropeller/pkg/controller/workflowstore/factory.go b/flytepropeller/pkg/controller/workflowstore/factory.go index 1cadc73543..5834b58de0 100644 --- a/flytepropeller/pkg/controller/workflowstore/factory.go +++ b/flytepropeller/pkg/controller/workflowstore/factory.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - flyteworkflowv1alpha1 "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/promutils" + flyteworkflowv1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) func NewWorkflowStore(ctx context.Context, cfg *Config, lister v1alpha1.FlyteWorkflowLister, diff --git a/flytepropeller/pkg/controller/workflowstore/iface.go b/flytepropeller/pkg/controller/workflowstore/iface.go index f6c9eb4454..2640367552 100644 --- a/flytepropeller/pkg/controller/workflowstore/iface.go +++ b/flytepropeller/pkg/controller/workflowstore/iface.go @@ -3,7 +3,7 @@ package workflowstore import ( "context" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) //go:generate mockery -all diff --git a/flytepropeller/pkg/controller/workflowstore/inmemory.go b/flytepropeller/pkg/controller/workflowstore/inmemory.go index 874029222b..e376de8f1a 100644 --- a/flytepropeller/pkg/controller/workflowstore/inmemory.go +++ b/flytepropeller/pkg/controller/workflowstore/inmemory.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" kubeerrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/flytepropeller/pkg/controller/workflowstore/mocks/FlyteWorkflow.go b/flytepropeller/pkg/controller/workflowstore/mocks/FlyteWorkflow.go index cc18f5bd96..bed61028f8 100644 --- a/flytepropeller/pkg/controller/workflowstore/mocks/FlyteWorkflow.go +++ b/flytepropeller/pkg/controller/workflowstore/mocks/FlyteWorkflow.go @@ -5,10 +5,9 @@ package mocks import ( context "context" - v1alpha1 "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha1 "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + workflowstore "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflowstore" mock "github.com/stretchr/testify/mock" - - workflowstore "github.com/flyteorg/flytepropeller/pkg/controller/workflowstore" ) // FlyteWorkflow is an autogenerated mock type for the FlyteWorkflow type diff --git a/flytepropeller/pkg/controller/workflowstore/passthrough.go b/flytepropeller/pkg/controller/workflowstore/passthrough.go index 7ff565ea91..2d92b8249f 100644 --- a/flytepropeller/pkg/controller/workflowstore/passthrough.go +++ b/flytepropeller/pkg/controller/workflowstore/passthrough.go @@ -6,11 +6,11 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - v1alpha12 "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" - listers "github.com/flyteorg/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + v1alpha12 "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/typed/flyteworkflow/v1alpha1" + listers "github.com/flyteorg/flyte/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" kubeerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/flytepropeller/pkg/controller/workflowstore/passthrough_test.go b/flytepropeller/pkg/controller/workflowstore/passthrough_test.go index bd68a7edb8..54f7343e73 100644 --- a/flytepropeller/pkg/controller/workflowstore/passthrough_test.go +++ b/flytepropeller/pkg/controller/workflowstore/passthrough_test.go @@ -5,15 +5,15 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" "github.com/stretchr/testify/assert" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - listers "github.com/flyteorg/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + listers "github.com/flyteorg/flyte/flytepropeller/pkg/client/listers/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/fake" + "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/fake" kubeerrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/flytepropeller/pkg/controller/workflowstore/resource_version_caching.go b/flytepropeller/pkg/controller/workflowstore/resource_version_caching.go index 234b072154..c216b7a9d1 100644 --- a/flytepropeller/pkg/controller/workflowstore/resource_version_caching.go +++ b/flytepropeller/pkg/controller/workflowstore/resource_version_caching.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) // TODO - optimization maybe? we can move this to predicate check, before we add it to the queue? diff --git a/flytepropeller/pkg/controller/workflowstore/resource_version_caching_test.go b/flytepropeller/pkg/controller/workflowstore/resource_version_caching_test.go index 10970cfe78..8d9b2d6a84 100644 --- a/flytepropeller/pkg/controller/workflowstore/resource_version_caching_test.go +++ b/flytepropeller/pkg/controller/workflowstore/resource_version_caching_test.go @@ -12,13 +12,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" testing2 "k8s.io/client-go/testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" goObjectHash "github.com/benlaurie/objecthash/go/objecthash" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/fake" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/fake" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" kubeerrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/flytepropeller/pkg/controller/workflowstore/terminated_tracking.go b/flytepropeller/pkg/controller/workflowstore/terminated_tracking.go index b2c75c97d3..2bf0be51da 100644 --- a/flytepropeller/pkg/controller/workflowstore/terminated_tracking.go +++ b/flytepropeller/pkg/controller/workflowstore/terminated_tracking.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytestdlib/fastcheck" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytestdlib/fastcheck" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) func workflowKey(namespace, name string) string { diff --git a/flytepropeller/pkg/controller/workflowstore/terminated_tracking_test.go b/flytepropeller/pkg/controller/workflowstore/terminated_tracking_test.go index d88c8ed2d8..d17d394f8a 100644 --- a/flytepropeller/pkg/controller/workflowstore/terminated_tracking_test.go +++ b/flytepropeller/pkg/controller/workflowstore/terminated_tracking_test.go @@ -6,9 +6,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/fake" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/fake" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/controller/workqueue.go b/flytepropeller/pkg/controller/workqueue.go index fd30394c94..3209c632f6 100644 --- a/flytepropeller/pkg/controller/workqueue.go +++ b/flytepropeller/pkg/controller/workqueue.go @@ -3,13 +3,13 @@ package controller import ( "context" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" "golang.org/x/time/rate" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" // Setup workqueue metrics - _ "github.com/flyteorg/flytestdlib/promutils" + _ "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/client-go/util/workqueue" ) diff --git a/flytepropeller/pkg/controller/workqueue_test.go b/flytepropeller/pkg/controller/workqueue_test.go index 4b3d00b663..74a8108014 100644 --- a/flytepropeller/pkg/controller/workqueue_test.go +++ b/flytepropeller/pkg/controller/workqueue_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - config2 "github.com/flyteorg/flytepropeller/pkg/controller/config" + config2 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/leaderelection/leader_election.go b/flytepropeller/pkg/leaderelection/leader_election.go index 89def57196..cbd895d036 100644 --- a/flytepropeller/pkg/leaderelection/leader_election.go +++ b/flytepropeller/pkg/leaderelection/leader_election.go @@ -7,7 +7,7 @@ import ( v12 "k8s.io/client-go/kubernetes/typed/coordination/v1" - "github.com/flyteorg/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" "k8s.io/apimachinery/pkg/util/rand" diff --git a/flytepropeller/pkg/utils/failing_datastore.go b/flytepropeller/pkg/utils/failing_datastore.go index fa88be68e4..f3b65471c7 100644 --- a/flytepropeller/pkg/utils/failing_datastore.go +++ b/flytepropeller/pkg/utils/failing_datastore.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" ) type FailingRawStore struct { diff --git a/flytepropeller/pkg/utils/failing_datastore_test.go b/flytepropeller/pkg/utils/failing_datastore_test.go index 6bb9cfb1a8..820ab8b84b 100644 --- a/flytepropeller/pkg/utils/failing_datastore_test.go +++ b/flytepropeller/pkg/utils/failing_datastore_test.go @@ -5,7 +5,7 @@ import ( "context" "testing" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/stretchr/testify/assert" ) diff --git a/flytepropeller/pkg/utils/k8s.go b/flytepropeller/pkg/utils/k8s.go index 52225106ee..0bbdf93f87 100644 --- a/flytepropeller/pkg/utils/k8s.go +++ b/flytepropeller/pkg/utils/k8s.go @@ -7,11 +7,11 @@ import ( "regexp" "strings" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + flyteScheme "github.com/flyteorg/flyte/flytepropeller/pkg/client/clientset/versioned/scheme" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - flyteScheme "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned/scheme" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytestdlib/logger" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp" "github.com/pkg/errors" diff --git a/flytepropeller/pkg/utils/k8s_test.go b/flytepropeller/pkg/utils/k8s_test.go index 62581165e8..b14c2dffa9 100644 --- a/flytepropeller/pkg/utils/k8s_test.go +++ b/flytepropeller/pkg/utils/k8s_test.go @@ -10,7 +10,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" ) func TestToK8sEnvVar(t *testing.T) { diff --git a/flytepropeller/pkg/visualize/nodeq.go b/flytepropeller/pkg/visualize/nodeq.go index 3ecc65f168..0d0bb447ab 100644 --- a/flytepropeller/pkg/visualize/nodeq.go +++ b/flytepropeller/pkg/visualize/nodeq.go @@ -1,6 +1,6 @@ package visualize -import "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" +import "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" type NodeQ []v1alpha1.NodeID diff --git a/flytepropeller/pkg/visualize/sort.go b/flytepropeller/pkg/visualize/sort.go index 3b38af355a..7dbe96df50 100644 --- a/flytepropeller/pkg/visualize/sort.go +++ b/flytepropeller/pkg/visualize/sort.go @@ -1,7 +1,7 @@ package visualize import ( - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/pkg/errors" ) diff --git a/flytepropeller/pkg/visualize/visualize.go b/flytepropeller/pkg/visualize/visualize.go index 2ab8d69f9c..e325312b43 100644 --- a/flytepropeller/pkg/visualize/visualize.go +++ b/flytepropeller/pkg/visualize/visualize.go @@ -5,9 +5,9 @@ import ( "reflect" "strings" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" - "github.com/flyteorg/flytepropeller/pkg/compiler/common" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/flytepropeller/pkg/webhook/aws_secret_manager.go b/flytepropeller/pkg/webhook/aws_secret_manager.go index 2014c3a8d8..866f7f0f81 100644 --- a/flytepropeller/pkg/webhook/aws_secret_manager.go +++ b/flytepropeller/pkg/webhook/aws_secret_manager.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytestdlib/logger" corev1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/webhook/aws_secret_manager_test.go b/flytepropeller/pkg/webhook/aws_secret_manager_test.go index d60caab291..849f69113e 100644 --- a/flytepropeller/pkg/webhook/aws_secret_manager_test.go +++ b/flytepropeller/pkg/webhook/aws_secret_manager_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" "github.com/go-test/deep" diff --git a/flytepropeller/pkg/webhook/config/config.go b/flytepropeller/pkg/webhook/config/config.go index 2f91b953af..9bf5b57323 100644 --- a/flytepropeller/pkg/webhook/config/config.go +++ b/flytepropeller/pkg/webhook/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/flytepropeller/pkg/webhook/entrypoint.go b/flytepropeller/pkg/webhook/entrypoint.go index 50c4099c2e..de8f9ab820 100644 --- a/flytepropeller/pkg/webhook/entrypoint.go +++ b/flytepropeller/pkg/webhook/entrypoint.go @@ -7,11 +7,11 @@ import ( "fmt" "os" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/utils" - config2 "github.com/flyteorg/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + config2 "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/flytepropeller/pkg/webhook/gcp_secret_manager.go b/flytepropeller/pkg/webhook/gcp_secret_manager.go index eafa409869..518ec87a4e 100644 --- a/flytepropeller/pkg/webhook/gcp_secret_manager.go +++ b/flytepropeller/pkg/webhook/gcp_secret_manager.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytestdlib/logger" corev1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/webhook/gcp_secret_manager_test.go b/flytepropeller/pkg/webhook/gcp_secret_manager_test.go index e9dec5c444..09ce340d2e 100644 --- a/flytepropeller/pkg/webhook/gcp_secret_manager_test.go +++ b/flytepropeller/pkg/webhook/gcp_secret_manager_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" "github.com/go-test/deep" diff --git a/flytepropeller/pkg/webhook/global_secrets.go b/flytepropeller/pkg/webhook/global_secrets.go index 42c8869d51..d0a4aa2d8d 100644 --- a/flytepropeller/pkg/webhook/global_secrets.go +++ b/flytepropeller/pkg/webhook/global_secrets.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/logger" coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" corev1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/webhook/global_secrets_test.go b/flytepropeller/pkg/webhook/global_secrets_test.go index 8f1573e867..c05cd3ec42 100644 --- a/flytepropeller/pkg/webhook/global_secrets_test.go +++ b/flytepropeller/pkg/webhook/global_secrets_test.go @@ -5,14 +5,14 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" "github.com/stretchr/testify/assert" "github.com/go-test/deep" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/mocks" coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/webhook/mocks" "github.com/stretchr/testify/mock" corev1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/webhook/init_cert.go b/flytepropeller/pkg/webhook/init_cert.go index dc002fd217..ba9c2c7f64 100644 --- a/flytepropeller/pkg/webhook/init_cert.go +++ b/flytepropeller/pkg/webhook/init_cert.go @@ -14,10 +14,10 @@ import ( "path" "time" - "github.com/flyteorg/flytepropeller/pkg/controller/config" - "github.com/flyteorg/flytepropeller/pkg/utils" - webhookConfig "github.com/flyteorg/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/utils" + webhookConfig "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/logger" corev1 "k8s.io/api/core/v1" kubeErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flytepropeller/pkg/webhook/k8s_secrets.go b/flytepropeller/pkg/webhook/k8s_secrets.go index f207da362c..bc01fa1ba8 100644 --- a/flytepropeller/pkg/webhook/k8s_secrets.go +++ b/flytepropeller/pkg/webhook/k8s_secrets.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/logger" corev1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/webhook/mocks/secrets_injector.go b/flytepropeller/pkg/webhook/mocks/secrets_injector.go index 0ce16c6881..54beb45e7d 100644 --- a/flytepropeller/pkg/webhook/mocks/secrets_injector.go +++ b/flytepropeller/pkg/webhook/mocks/secrets_injector.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - config "github.com/flyteorg/flytepropeller/pkg/webhook/config" + config "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flytepropeller/pkg/webhook/pod.go b/flytepropeller/pkg/webhook/pod.go index 29ee88c5a6..412bb24ff3 100644 --- a/flytepropeller/pkg/webhook/pod.go +++ b/flytepropeller/pkg/webhook/pod.go @@ -36,15 +36,15 @@ import ( "path/filepath" "strings" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils/secrets" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils/secrets" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" diff --git a/flytepropeller/pkg/webhook/pod_test.go b/flytepropeller/pkg/webhook/pod_test.go index d8248e2237..3c334a75cc 100644 --- a/flytepropeller/pkg/webhook/pod_test.go +++ b/flytepropeller/pkg/webhook/pod_test.go @@ -5,16 +5,16 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" "k8s.io/client-go/tools/clientcmd/api/latest" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" - "github.com/flyteorg/flytepropeller/pkg/webhook/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/assert" diff --git a/flytepropeller/pkg/webhook/secrets.go b/flytepropeller/pkg/webhook/secrets.go index eae878cefe..727befa05c 100644 --- a/flytepropeller/pkg/webhook/secrets.go +++ b/flytepropeller/pkg/webhook/secrets.go @@ -5,13 +5,13 @@ import ( "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - secretUtils "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils/secrets" + secretUtils "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils/secrets" - "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/secretmanager" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/secretmanager" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" corev1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/webhook/secrets_test.go b/flytepropeller/pkg/webhook/secrets_test.go index 90f69f37ab..7deb7beb5f 100644 --- a/flytepropeller/pkg/webhook/secrets_test.go +++ b/flytepropeller/pkg/webhook/secrets_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytepropeller/pkg/webhook/mocks" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/mocks" "github.com/stretchr/testify/mock" corev1 "k8s.io/api/core/v1" diff --git a/flytepropeller/pkg/webhook/utils.go b/flytepropeller/pkg/webhook/utils.go index 2dd0bb9915..3be7c57355 100644 --- a/flytepropeller/pkg/webhook/utils.go +++ b/flytepropeller/pkg/webhook/utils.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/encoding" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" diff --git a/flytepropeller/pkg/webhook/vault_secret_manager.go b/flytepropeller/pkg/webhook/vault_secret_manager.go index 9a337483ac..6e44459417 100644 --- a/flytepropeller/pkg/webhook/vault_secret_manager.go +++ b/flytepropeller/pkg/webhook/vault_secret_manager.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" + "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/utils" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" + "github.com/flyteorg/flyte/flytestdlib/logger" coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" - "github.com/flyteorg/flytestdlib/logger" corev1 "k8s.io/api/core/v1" ) diff --git a/flytepropeller/pkg/webhook/vault_secret_manager_test.go b/flytepropeller/pkg/webhook/vault_secret_manager_test.go index 8c048a258f..5faee86ca1 100644 --- a/flytepropeller/pkg/webhook/vault_secret_manager_test.go +++ b/flytepropeller/pkg/webhook/vault_secret_manager_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flytepropeller/pkg/webhook/config" coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytepropeller/pkg/webhook/config" "github.com/go-test/deep" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/flytepropeller/plugins/loader.go b/flytepropeller/plugins/loader.go index 68635dc786..47620a5172 100644 --- a/flytepropeller/plugins/loader.go +++ b/flytepropeller/plugins/loader.go @@ -3,19 +3,19 @@ package plugins import ( // Common place to import all plugins, so that it can be imported by Singlebinary (flytelite) or by propeller main - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/k8s" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/dask" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/pod" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/ray" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/spark" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/webapi/athena" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/webapi/bigquery" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/webapi/databricks" - _ "github.com/flyteorg/flyteplugins/go/tasks/plugins/webapi/snowflake" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/awsbatch" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/array/k8s" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/hive" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/dask" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/kfoperators/tensorflow" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/pod" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/ray" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/sagemaker" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/k8s/spark" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/webapi/athena" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/webapi/bigquery" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/webapi/databricks" + _ "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/webapi/snowflake" ) diff --git a/flytestdlib/boilerplate/flyte/golang_support_tools/tools.go b/flytestdlib/boilerplate/flyte/golang_support_tools/tools.go index 43de03450c..a78b61162a 100644 --- a/flytestdlib/boilerplate/flyte/golang_support_tools/tools.go +++ b/flytestdlib/boilerplate/flyte/golang_support_tools/tools.go @@ -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" ) diff --git a/flytestdlib/cache/auto_refresh.go b/flytestdlib/cache/auto_refresh.go index d4bed3e96e..f76bd2197a 100644 --- a/flytestdlib/cache/auto_refresh.go +++ b/flytestdlib/cache/auto_refresh.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "k8s.io/client-go/util/workqueue" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" lru "github.com/hashicorp/golang-lru" "github.com/prometheus/client_golang/prometheus" "k8s.io/apimachinery/pkg/util/wait" diff --git a/flytestdlib/cache/auto_refresh_example_test.go b/flytestdlib/cache/auto_refresh_example_test.go index 1f0bd5fc9f..ab0e04bde0 100644 --- a/flytestdlib/cache/auto_refresh_example_test.go +++ b/flytestdlib/cache/auto_refresh_example_test.go @@ -8,9 +8,9 @@ import ( "k8s.io/client-go/util/workqueue" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type ExampleItemStatus string diff --git a/flytestdlib/cache/auto_refresh_test.go b/flytestdlib/cache/auto_refresh_test.go index 301b5c81a1..c04712ca47 100644 --- a/flytestdlib/cache/auto_refresh_test.go +++ b/flytestdlib/cache/auto_refresh_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/atomic" + "github.com/flyteorg/flyte/flytestdlib/atomic" "k8s.io/client-go/util/workqueue" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/cache/mocks/AutoRefresh.go b/flytestdlib/cache/mocks/AutoRefresh.go index a0d37ac9b7..df660b44f8 100644 --- a/flytestdlib/cache/mocks/AutoRefresh.go +++ b/flytestdlib/cache/mocks/AutoRefresh.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - cache "github.com/flyteorg/flytestdlib/cache" + cache "github.com/flyteorg/flyte/flytestdlib/cache" mock "github.com/stretchr/testify/mock" ) diff --git a/flytestdlib/cache/mocks/ItemWrapper.go b/flytestdlib/cache/mocks/ItemWrapper.go index 428490ff41..16c916f1d3 100644 --- a/flytestdlib/cache/mocks/ItemWrapper.go +++ b/flytestdlib/cache/mocks/ItemWrapper.go @@ -3,7 +3,7 @@ package mocks import ( - cache "github.com/flyteorg/flytestdlib/cache" + cache "github.com/flyteorg/flyte/flytestdlib/cache" mock "github.com/stretchr/testify/mock" ) diff --git a/flytestdlib/cli/pflags/api/generator.go b/flytestdlib/cli/pflags/api/generator.go index 60649c2d2f..8ceeeb8c7b 100644 --- a/flytestdlib/cli/pflags/api/generator.go +++ b/flytestdlib/cli/pflags/api/generator.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "golang.org/x/tools/go/packages" diff --git a/flytestdlib/cli/pflags/api/generator_test.go b/flytestdlib/cli/pflags/api/generator_test.go index 0990382245..022515fef1 100644 --- a/flytestdlib/cli/pflags/api/generator_test.go +++ b/flytestdlib/cli/pflags/api/generator_test.go @@ -67,7 +67,7 @@ func TestNewGenerator(t *testing.T) { for _, typ := range testCases { t.Run("Test "+typ.TypeName, func(t *testing.T) { - g, err := NewGenerator("github.com/flyteorg/flytestdlib/cli/pflags/api", typ.TypeName, typ.DefaultVariableName, typ.shouldBindDefaultVariable) + g, err := NewGenerator("github.com/flyteorg/flyte/flytestdlib/cli/pflags/api", typ.TypeName, typ.DefaultVariableName, typ.shouldBindDefaultVariable) if !assert.NoError(t, err) { t.FailNow() } diff --git a/flytestdlib/cli/pflags/api/sample.go b/flytestdlib/cli/pflags/api/sample.go index f84e9ad353..6f38e4f50c 100644 --- a/flytestdlib/cli/pflags/api/sample.go +++ b/flytestdlib/cli/pflags/api/sample.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/storage" ) var DefaultTestType = &TestType{ diff --git a/flytestdlib/cli/pflags/cmd/root.go b/flytestdlib/cli/pflags/cmd/root.go index 8ff376691c..98928991d2 100644 --- a/flytestdlib/cli/pflags/cmd/root.go +++ b/flytestdlib/cli/pflags/cmd/root.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/flyteorg/flytestdlib/cli/pflags/api" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/cli/pflags/api" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/spf13/cobra" ) diff --git a/flytestdlib/cli/pflags/cmd/version.go b/flytestdlib/cli/pflags/cmd/version.go index d3b9fd22a1..d70a5bbed1 100644 --- a/flytestdlib/cli/pflags/cmd/version.go +++ b/flytestdlib/cli/pflags/cmd/version.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/flyteorg/flytestdlib/version" + "github.com/flyteorg/flyte/flytestdlib/version" "github.com/spf13/cobra" ) diff --git a/flytestdlib/cli/pflags/main.go b/flytestdlib/cli/pflags/main.go index 1edd73cbba..5c8aaffdd2 100644 --- a/flytestdlib/cli/pflags/main.go +++ b/flytestdlib/cli/pflags/main.go @@ -4,7 +4,7 @@ package main import ( "log" - "github.com/flyteorg/flytestdlib/cli/pflags/cmd" + "github.com/flyteorg/flyte/flytestdlib/cli/pflags/cmd" ) func main() { diff --git a/flytestdlib/config/regexp_test.go b/flytestdlib/config/regexp_test.go index ceda744349..60010491c2 100644 --- a/flytestdlib/config/regexp_test.go +++ b/flytestdlib/config/regexp_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/flyteorg/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/config/section.go b/flytestdlib/config/section.go index ee0b516087..d926c5719e 100644 --- a/flytestdlib/config/section.go +++ b/flytestdlib/config/section.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/flyteorg/flytestdlib/atomic" + "github.com/flyteorg/flyte/flytestdlib/atomic" "github.com/spf13/pflag" ) diff --git a/flytestdlib/config/section_test.go b/flytestdlib/config/section_test.go index 7a694a9f55..52f4e31ec8 100644 --- a/flytestdlib/config/section_test.go +++ b/flytestdlib/config/section_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/util/rand" - "github.com/flyteorg/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" "github.com/ghodss/yaml" "github.com/spf13/pflag" diff --git a/flytestdlib/config/tests/accessor_test.go b/flytestdlib/config/tests/accessor_test.go index 813e2794c6..a5c7b7c7ee 100644 --- a/flytestdlib/config/tests/accessor_test.go +++ b/flytestdlib/config/tests/accessor_test.go @@ -18,8 +18,8 @@ import ( k8sRand "k8s.io/apimachinery/pkg/util/rand" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" "github.com/spf13/pflag" "github.com/ghodss/yaml" diff --git a/flytestdlib/config/tests/config_cmd_test.go b/flytestdlib/config/tests/config_cmd_test.go index 05accc36c5..05a5cb1ab5 100644 --- a/flytestdlib/config/tests/config_cmd_test.go +++ b/flytestdlib/config/tests/config_cmd_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/flytestdlib/config/tests/types_test.go b/flytestdlib/config/tests/types_test.go index 1c7b9ab9bd..3fe658687f 100644 --- a/flytestdlib/config/tests/types_test.go +++ b/flytestdlib/config/tests/types_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" - "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/pflag" ) diff --git a/flytestdlib/config/url_test.go b/flytestdlib/config/url_test.go index 9cd9841368..9c9febb301 100644 --- a/flytestdlib/config/url_test.go +++ b/flytestdlib/config/url_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/flyteorg/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/config/utils.go b/flytestdlib/config/utils.go index d69edc5cca..581dd6ef9a 100644 --- a/flytestdlib/config/utils.go +++ b/flytestdlib/config/utils.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - stdLibErrs "github.com/flyteorg/flytestdlib/errors" + stdLibErrs "github.com/flyteorg/flyte/flytestdlib/errors" ) // Uses Json marshal/unmarshal to make a deep copy of a config object. diff --git a/flytestdlib/config/viper/collection.go b/flytestdlib/config/viper/collection.go index 7ef55136b9..5924a7eaf2 100644 --- a/flytestdlib/config/viper/collection.go +++ b/flytestdlib/config/viper/collection.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" viperLib "github.com/spf13/viper" diff --git a/flytestdlib/config/viper/viper.go b/flytestdlib/config/viper/viper.go index a8cc9b4d1f..d7e3db299a 100644 --- a/flytestdlib/config/viper/viper.go +++ b/flytestdlib/config/viper/viper.go @@ -14,13 +14,13 @@ import ( "github.com/pkg/errors" - stdLibErrs "github.com/flyteorg/flytestdlib/errors" + stdLibErrs "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/spf13/cobra" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/files" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/files" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/fsnotify/fsnotify" "github.com/mitchellh/mapstructure" diff --git a/flytestdlib/database/config.go b/flytestdlib/database/config.go index 50522c5491..c3dc2a31c0 100644 --- a/flytestdlib/database/config.go +++ b/flytestdlib/database/config.go @@ -3,7 +3,7 @@ package database import ( "time" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) const ( diff --git a/flytestdlib/database/config_test.go b/flytestdlib/database/config_test.go index 23fcd2b544..d7c353cc64 100644 --- a/flytestdlib/database/config_test.go +++ b/flytestdlib/database/config_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/config/viper" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/database/gorm.go b/flytestdlib/database/gorm.go index 7672806e00..17800f712d 100644 --- a/flytestdlib/database/gorm.go +++ b/flytestdlib/database/gorm.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" gormLogger "gorm.io/gorm/logger" ) diff --git a/flytestdlib/fastcheck/fastcheck_test.go b/flytestdlib/fastcheck/fastcheck_test.go index 07ad57d354..0594c21e3b 100644 --- a/flytestdlib/fastcheck/fastcheck_test.go +++ b/flytestdlib/fastcheck/fastcheck_test.go @@ -5,9 +5,9 @@ import ( "math/rand" "testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/fastcheck/iface.go b/flytestdlib/fastcheck/iface.go index 0eec7bc7c6..874b834247 100644 --- a/flytestdlib/fastcheck/iface.go +++ b/flytestdlib/fastcheck/iface.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) // Filter provides an interface to check if a Key of type []byte was ever seen. diff --git a/flytestdlib/fastcheck/lru.go b/flytestdlib/fastcheck/lru.go index 86c557a46f..5657dcf687 100644 --- a/flytestdlib/fastcheck/lru.go +++ b/flytestdlib/fastcheck/lru.go @@ -3,7 +3,7 @@ package fastcheck import ( "context" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" cache "github.com/hashicorp/golang-lru" ) diff --git a/flytestdlib/fastcheck/oppobloom.go b/flytestdlib/fastcheck/oppobloom.go index b3582fffc7..2521abc393 100644 --- a/flytestdlib/fastcheck/oppobloom.go +++ b/flytestdlib/fastcheck/oppobloom.go @@ -19,7 +19,7 @@ import ( "sync/atomic" "unsafe" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) var ErrSizeTooLarge = errors.New("oppobloom: size given too large to round to a power of 2") diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod index b907b931b2..4793b283d2 100644 --- a/flytestdlib/go.mod +++ b/flytestdlib/go.mod @@ -1,4 +1,4 @@ -module github.com/flyteorg/flytestdlib +module github.com/flyteorg/flyte/flytestdlib go 1.19 @@ -104,3 +104,12 @@ require ( k8s.io/klog/v2 v2.5.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // 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 +) diff --git a/flytestdlib/ioutils/timed_readers_test.go b/flytestdlib/ioutils/timed_readers_test.go index d7b57110be..f2c72438b1 100644 --- a/flytestdlib/ioutils/timed_readers_test.go +++ b/flytestdlib/ioutils/timed_readers_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/logger/config.go b/flytestdlib/logger/config.go index ac8d59afea..4654c7c998 100644 --- a/flytestdlib/logger/config.go +++ b/flytestdlib/logger/config.go @@ -3,7 +3,7 @@ package logger import ( "context" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" ) //go:generate pflags Config --default-var defaultConfig diff --git a/flytestdlib/logger/logger.go b/flytestdlib/logger/logger.go index 924c8526cd..c97c5a1692 100644 --- a/flytestdlib/logger/logger.go +++ b/flytestdlib/logger/logger.go @@ -10,7 +10,7 @@ import ( "runtime" "strings" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "github.com/sirupsen/logrus" ) diff --git a/flytestdlib/pbhash/pbhash.go b/flytestdlib/pbhash/pbhash.go index 9aff349190..067b8c9ce8 100644 --- a/flytestdlib/pbhash/pbhash.go +++ b/flytestdlib/pbhash/pbhash.go @@ -6,7 +6,7 @@ import ( "encoding/base64" goObjectHash "github.com/benlaurie/objecthash/go/objecthash" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" ) diff --git a/flytestdlib/profutils/server.go b/flytestdlib/profutils/server.go index 14089d550a..b5fa044e8e 100644 --- a/flytestdlib/profutils/server.go +++ b/flytestdlib/profutils/server.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/version" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/version" "github.com/prometheus/client_golang/prometheus/promhttp" // #nosec G108 diff --git a/flytestdlib/profutils/server_test.go b/flytestdlib/profutils/server_test.go index cfab64783b..212d41e31d 100644 --- a/flytestdlib/profutils/server_test.go +++ b/flytestdlib/profutils/server_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/version" + "github.com/flyteorg/flyte/flytestdlib/version" - "github.com/flyteorg/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/promutils/labeled/counter.go b/flytestdlib/promutils/labeled/counter.go index 66ede96314..d4348de9d2 100644 --- a/flytestdlib/promutils/labeled/counter.go +++ b/flytestdlib/promutils/labeled/counter.go @@ -5,8 +5,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flytestdlib/promutils/labeled/counter_test.go b/flytestdlib/promutils/labeled/counter_test.go index 1836d71b43..bb51c4ba7f 100644 --- a/flytestdlib/promutils/labeled/counter_test.go +++ b/flytestdlib/promutils/labeled/counter_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/flytestdlib/promutils/labeled/gauge.go b/flytestdlib/promutils/labeled/gauge.go index 2b4bed677a..90c9d7214a 100644 --- a/flytestdlib/promutils/labeled/gauge.go +++ b/flytestdlib/promutils/labeled/gauge.go @@ -5,8 +5,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flytestdlib/promutils/labeled/gauge_test.go b/flytestdlib/promutils/labeled/gauge_test.go index 1b477e0ec7..396b46b085 100644 --- a/flytestdlib/promutils/labeled/gauge_test.go +++ b/flytestdlib/promutils/labeled/gauge_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/flytestdlib/promutils/labeled/keys.go b/flytestdlib/promutils/labeled/keys.go index 0479a45b44..38a193d7e1 100644 --- a/flytestdlib/promutils/labeled/keys.go +++ b/flytestdlib/promutils/labeled/keys.go @@ -5,7 +5,7 @@ import ( "reflect" "sync" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" ) var ( diff --git a/flytestdlib/promutils/labeled/keys_test.go b/flytestdlib/promutils/labeled/keys_test.go index e6fcce83e5..844d3095cd 100644 --- a/flytestdlib/promutils/labeled/keys_test.go +++ b/flytestdlib/promutils/labeled/keys_test.go @@ -3,7 +3,7 @@ package labeled import ( "testing" - "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/promutils/labeled/stopwatch.go b/flytestdlib/promutils/labeled/stopwatch.go index c78872841f..4e4a880346 100644 --- a/flytestdlib/promutils/labeled/stopwatch.go +++ b/flytestdlib/promutils/labeled/stopwatch.go @@ -6,8 +6,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type StopWatch struct { diff --git a/flytestdlib/promutils/labeled/stopwatch_test.go b/flytestdlib/promutils/labeled/stopwatch_test.go index 16f0b40139..dff609407f 100644 --- a/flytestdlib/promutils/labeled/stopwatch_test.go +++ b/flytestdlib/promutils/labeled/stopwatch_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/flytestdlib/promutils/labeled/summary.go b/flytestdlib/promutils/labeled/summary.go index 665ccd3a48..96134def67 100644 --- a/flytestdlib/promutils/labeled/summary.go +++ b/flytestdlib/promutils/labeled/summary.go @@ -5,8 +5,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" ) diff --git a/flytestdlib/promutils/labeled/summary_test.go b/flytestdlib/promutils/labeled/summary_test.go index 086f1424ec..4b19e9fca2 100644 --- a/flytestdlib/promutils/labeled/summary_test.go +++ b/flytestdlib/promutils/labeled/summary_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/flytestdlib/random/mocks/comparable.go b/flytestdlib/random/mocks/comparable.go index 4c6e4caa85..10d1aaa506 100644 --- a/flytestdlib/random/mocks/comparable.go +++ b/flytestdlib/random/mocks/comparable.go @@ -3,7 +3,7 @@ package mocks import ( - random "github.com/flyteorg/flytestdlib/random" + random "github.com/flyteorg/flyte/flytestdlib/random" mock "github.com/stretchr/testify/mock" ) diff --git a/flytestdlib/random/mocks/weighted_random_list.go b/flytestdlib/random/mocks/weighted_random_list.go index fb97dca8a2..f7227b6cc6 100644 --- a/flytestdlib/random/mocks/weighted_random_list.go +++ b/flytestdlib/random/mocks/weighted_random_list.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - random "github.com/flyteorg/flytestdlib/random" + random "github.com/flyteorg/flyte/flytestdlib/random" ) // WeightedRandomList is an autogenerated mock type for the WeightedRandomList type diff --git a/flytestdlib/random/weighted_random_list.go b/flytestdlib/random/weighted_random_list.go index 06d54a58fd..7a0d44bbaa 100644 --- a/flytestdlib/random/weighted_random_list.go +++ b/flytestdlib/random/weighted_random_list.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) //go:generate mockery -all -case=underscore diff --git a/flytestdlib/storage/cached_rawstore.go b/flytestdlib/storage/cached_rawstore.go index f3808282ab..56b434b48e 100644 --- a/flytestdlib/storage/cached_rawstore.go +++ b/flytestdlib/storage/cached_rawstore.go @@ -7,14 +7,14 @@ import ( "runtime/debug" "time" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/coocood/freecache" "github.com/prometheus/client_golang/prometheus" - "github.com/flyteorg/flytestdlib/ioutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/ioutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) const neverExpire = 0 diff --git a/flytestdlib/storage/cached_rawstore_test.go b/flytestdlib/storage/cached_rawstore_test.go index 153aa0ebfb..b9751d7fa1 100644 --- a/flytestdlib/storage/cached_rawstore_test.go +++ b/flytestdlib/storage/cached_rawstore_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytestdlib/ioutils" + "github.com/flyteorg/flyte/flytestdlib/ioutils" ) func TestNewCachedStore(t *testing.T) { diff --git a/flytestdlib/storage/config.go b/flytestdlib/storage/config.go index 3908205756..fc2f6f075d 100644 --- a/flytestdlib/storage/config.go +++ b/flytestdlib/storage/config.go @@ -3,8 +3,8 @@ package storage import ( "context" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/logger" ) //go:generate pflags Config --default-var=defaultConfig diff --git a/flytestdlib/storage/config_test.go b/flytestdlib/storage/config_test.go index dbe44614e5..e60c2cb622 100644 --- a/flytestdlib/storage/config_test.go +++ b/flytestdlib/storage/config_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" "github.com/ghodss/yaml" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/storage/copy_impl.go b/flytestdlib/storage/copy_impl.go index 0aa7327c7b..a4f9c5aea5 100644 --- a/flytestdlib/storage/copy_impl.go +++ b/flytestdlib/storage/copy_impl.go @@ -9,10 +9,10 @@ import ( errs "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/flyteorg/flytestdlib/ioutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/ioutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) type copyImpl struct { diff --git a/flytestdlib/storage/copy_impl_test.go b/flytestdlib/storage/copy_impl_test.go index a31770fc0e..57c0266ca9 100644 --- a/flytestdlib/storage/copy_impl_test.go +++ b/flytestdlib/storage/copy_impl_test.go @@ -7,11 +7,11 @@ import ( "math/rand" "testing" - "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytestdlib/ioutils" + "github.com/flyteorg/flyte/flytestdlib/ioutils" ) type notSeekerReader struct { diff --git a/flytestdlib/storage/init_test.go b/flytestdlib/storage/init_test.go index b7a4e75a4d..b2175f83b9 100644 --- a/flytestdlib/storage/init_test.go +++ b/flytestdlib/storage/init_test.go @@ -1,9 +1,9 @@ package storage import ( - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) var metrics *dataStoreMetrics diff --git a/flytestdlib/storage/mocks/composed_protobuf_store.go b/flytestdlib/storage/mocks/composed_protobuf_store.go index 0b645edada..ed77566643 100644 --- a/flytestdlib/storage/mocks/composed_protobuf_store.go +++ b/flytestdlib/storage/mocks/composed_protobuf_store.go @@ -10,7 +10,7 @@ import ( protoiface "google.golang.org/protobuf/runtime/protoiface" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // ComposedProtobufStore is an autogenerated mock type for the ComposedProtobufStore type diff --git a/flytestdlib/storage/mocks/raw_store.go b/flytestdlib/storage/mocks/raw_store.go index cb9d9b150b..aa02023f60 100644 --- a/flytestdlib/storage/mocks/raw_store.go +++ b/flytestdlib/storage/mocks/raw_store.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" ) // RawStore is an autogenerated mock type for the RawStore type diff --git a/flytestdlib/storage/mocks/reference_constructor.go b/flytestdlib/storage/mocks/reference_constructor.go index 08bc957daa..22fbeaf906 100644 --- a/flytestdlib/storage/mocks/reference_constructor.go +++ b/flytestdlib/storage/mocks/reference_constructor.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - storage "github.com/flyteorg/flytestdlib/storage" + storage "github.com/flyteorg/flyte/flytestdlib/storage" mock "github.com/stretchr/testify/mock" ) diff --git a/flytestdlib/storage/protobuf_store.go b/flytestdlib/storage/protobuf_store.go index e9a284dd58..30701d729f 100644 --- a/flytestdlib/storage/protobuf_store.go +++ b/flytestdlib/storage/protobuf_store.go @@ -10,9 +10,9 @@ import ( errs "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/flyteorg/flytestdlib/ioutils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/ioutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type protoMetrics struct { diff --git a/flytestdlib/storage/protobuf_store_test.go b/flytestdlib/storage/protobuf_store_test.go index 18ae0b36ae..687e5a5ecf 100644 --- a/flytestdlib/storage/protobuf_store_test.go +++ b/flytestdlib/storage/protobuf_store_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type mockProtoMessage struct { diff --git a/flytestdlib/storage/rawstores.go b/flytestdlib/storage/rawstores.go index f8d345c71d..230137d64a 100644 --- a/flytestdlib/storage/rawstores.go +++ b/flytestdlib/storage/rawstores.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" ) type dataStoreCreateFn func(ctx context.Context, cfg *Config, metrics *dataStoreMetrics) (RawStore, error) diff --git a/flytestdlib/storage/rawstores_test.go b/flytestdlib/storage/rawstores_test.go index fb46293da2..e6c5c71b9b 100644 --- a/flytestdlib/storage/rawstores_test.go +++ b/flytestdlib/storage/rawstores_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/flyteorg/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/storage/storage_test.go b/flytestdlib/storage/storage_test.go index f6773bc0d4..91f9300abc 100644 --- a/flytestdlib/storage/storage_test.go +++ b/flytestdlib/storage/storage_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/storage/stow_store.go b/flytestdlib/storage/stow_store.go index ab63521f42..9e38aa7c0e 100644 --- a/flytestdlib/storage/stow_store.go +++ b/flytestdlib/storage/stow_store.go @@ -20,11 +20,11 @@ import ( "github.com/flyteorg/stow/swift" errs "github.com/pkg/errors" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) const ( diff --git a/flytestdlib/storage/stow_store_test.go b/flytestdlib/storage/stow_store_test.go index 5c635560ba..fd70b8dfe1 100644 --- a/flytestdlib/storage/stow_store_test.go +++ b/flytestdlib/storage/stow_store_test.go @@ -25,10 +25,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flytestdlib/internal/utils" - "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/contextutils" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" ) type mockStowLoc struct { diff --git a/flytestdlib/storage/url_path.go b/flytestdlib/storage/url_path.go index d5dc9e9d51..8e6af05df5 100644 --- a/flytestdlib/storage/url_path.go +++ b/flytestdlib/storage/url_path.go @@ -9,7 +9,7 @@ import ( "net/url" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/flytestdlib/storage/utils.go b/flytestdlib/storage/utils.go index 0c3f7d7754..8b916ac74d 100644 --- a/flytestdlib/storage/utils.go +++ b/flytestdlib/storage/utils.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - stdErrs "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils/labeled" + stdErrs "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/flyteorg/stow" "github.com/pkg/errors" diff --git a/flytestdlib/storage/utils_test.go b/flytestdlib/storage/utils_test.go index adea66d11f..693c460730 100644 --- a/flytestdlib/storage/utils_test.go +++ b/flytestdlib/storage/utils_test.go @@ -5,7 +5,7 @@ import ( "syscall" "testing" - flyteerrors "github.com/flyteorg/flytestdlib/errors" + flyteerrors "github.com/flyteorg/flyte/flytestdlib/errors" "github.com/flyteorg/stow" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/flytestdlib/tests/config_test.go b/flytestdlib/tests/config_test.go index 60986b5000..736d89b8de 100644 --- a/flytestdlib/tests/config_test.go +++ b/flytestdlib/tests/config_test.go @@ -9,12 +9,12 @@ import ( "reflect" "testing" - "github.com/flyteorg/flytestdlib/config/viper" + "github.com/flyteorg/flyte/flytestdlib/config/viper" - "github.com/flyteorg/flytestdlib/config" - "github.com/flyteorg/flytestdlib/internal/utils" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/internal/utils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/storage" "github.com/ghodss/yaml" "github.com/stretchr/testify/assert" ) diff --git a/flytestdlib/utils/auto_refresh_cache.go b/flytestdlib/utils/auto_refresh_cache.go index 0491ba86f2..19e4d391a1 100644 --- a/flytestdlib/utils/auto_refresh_cache.go +++ b/flytestdlib/utils/auto_refresh_cache.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/flyteorg/flytestdlib/logger" - "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/promutils" lru "github.com/hashicorp/golang-lru" "github.com/prometheus/client_golang/prometheus" "k8s.io/apimachinery/pkg/util/wait" diff --git a/flytestdlib/utils/marshal_utils_test.go b/flytestdlib/utils/marshal_utils_test.go index 6e7d94d973..68a9dd4821 100644 --- a/flytestdlib/utils/marshal_utils_test.go +++ b/flytestdlib/utils/marshal_utils_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-test/deep" "github.com/stretchr/testify/assert" - "github.com/flyteorg/flytestdlib/utils/prototest" + "github.com/flyteorg/flyte/flytestdlib/utils/prototest" "github.com/golang/protobuf/proto" structpb "github.com/golang/protobuf/ptypes/struct" v1 "k8s.io/api/core/v1" diff --git a/flytestdlib/utils/mocks/auto_refresh_cache.go b/flytestdlib/utils/mocks/auto_refresh_cache.go index 2844fad011..bca17869ff 100644 --- a/flytestdlib/utils/mocks/auto_refresh_cache.go +++ b/flytestdlib/utils/mocks/auto_refresh_cache.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - utils "github.com/flyteorg/flytestdlib/utils" + utils "github.com/flyteorg/flyte/flytestdlib/utils" mock "github.com/stretchr/testify/mock" ) diff --git a/flytestdlib/utils/rate_limiter.go b/flytestdlib/utils/rate_limiter.go index 25e784a8e4..6884544c0a 100644 --- a/flytestdlib/utils/rate_limiter.go +++ b/flytestdlib/utils/rate_limiter.go @@ -3,7 +3,7 @@ package utils import ( "context" - "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flyte/flytestdlib/logger" "golang.org/x/time/rate" ) diff --git a/go.mod b/go.mod index a895e731b0..f256bf66cc 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module github.com/flyteorg/flyte go 1.19 require ( - github.com/flyteorg/datacatalog v1.0.53 - github.com/flyteorg/flyteadmin v1.1.118 - github.com/flyteorg/flytepropeller v1.1.116 - github.com/flyteorg/flytestdlib v1.0.22 + github.com/flyteorg/flyte/datacatalog v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyte/flyteadmin v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyte/flytepropeller v0.0.0-00010101000000-000000000000 + github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000 github.com/golang/glog v1.1.0 github.com/prometheus/client_golang v1.12.1 github.com/spf13/cobra v1.4.0 @@ -71,8 +71,8 @@ require ( github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.1 // indirect - github.com/flyteorg/flyteidl v1.5.14 // indirect - github.com/flyteorg/flyteplugins v1.1.16 // indirect + github.com/flyteorg/flyte/flyteplugins v0.0.0-00010101000000-000000000000 // indirect + github.com/flyteorg/flyteidl v0.0.0-00010101000000-000000000000 // indirect github.com/flyteorg/stow v0.3.7 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/ghodss/yaml v1.0.0 // indirect @@ -216,4 +216,13 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/robfig/cron/v3 => github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a +replace ( + github.com/flyteorg/flyte/datacatalog => ./datacatalog + github.com/flyteorg/flyte/flyteadmin => ./flyteadmin + github.com/flyteorg/flyte/flytecopilot => ./flytecopilot + github.com/flyteorg/flyte/flyteplugins => ./flyteplugins + github.com/flyteorg/flyte/flytepropeller => ./flytepropeller + github.com/flyteorg/flyte/flytestdlib => ./flytestdlib + github.com/flyteorg/flyteidl => ./flyteidl + github.com/robfig/cron/v3 => github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a +) diff --git a/go.sum b/go.sum index bf25d02f3d..50cbd1a202 100644 --- a/go.sum +++ b/go.sum @@ -343,18 +343,6 @@ github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flyteorg/datacatalog v1.0.53 h1:h06iGGTFFPGzMCowW+HHmYSYjOiSbv73quxoEFY7H1s= -github.com/flyteorg/datacatalog v1.0.53/go.mod h1:bTNS5x+IVNuwawEQMQCRsdnV2bt750nGq+dc6cmxF6w= -github.com/flyteorg/flyteadmin v1.1.118 h1:KBXC6DeDaTJze8aCu1CmFZmKMQOaXmLek43X09yg5sI= -github.com/flyteorg/flyteadmin v1.1.118/go.mod h1:FzjmBGA3Wc1X/l3sjHD6Kgy2LEe16KHm1Mx0JPqWdAg= -github.com/flyteorg/flyteidl v1.5.14 h1:+3ewipoOp82fPyIVgvvrMq1lorl5Kz3Lh6sh/a9+loI= -github.com/flyteorg/flyteidl v1.5.14/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flyteplugins v1.1.16 h1:DIQxPERFMvTGnLTkkeG9R8STF3YMvxK1nPtFf+a6o5Q= -github.com/flyteorg/flyteplugins v1.1.16/go.mod h1:HEd4yf0H8XfxMcHFwrTdTIJ/9lEAz83OpgcFQe47L6I= -github.com/flyteorg/flytepropeller v1.1.116 h1:qe6wOfxceTN4eqmAAb1Pj8tTcFarTkBr0uphZPNF1aM= -github.com/flyteorg/flytepropeller v1.1.116/go.mod h1:qAzIN35Xihc2B9JoMukzIBID7ZDh8xgOf9aVe56mN8M= -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/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=