From 63cb49c3b4c2e990c9e5a18ce38fb2eb62c82d15 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 6 Oct 2023 13:43:10 -0700 Subject: [PATCH 1/3] imports Signed-off-by: Katrina Rogan --- cmd/compile/compile.go | 6 +++--- cmd/config/subcommand/project/project_config.go | 2 +- cmd/config/subcommand/project/project_config_test.go | 2 +- cmd/configuration/configuration.go | 2 +- cmd/core/cmd.go | 2 +- cmd/core/cmd_ctx.go | 2 +- cmd/create/project.go | 4 ++-- cmd/delete/execution.go | 6 +++--- cmd/delete/execution_test.go | 2 +- cmd/delete/matchable_attribute_util.go | 2 +- cmd/delete/matchable_cluster_resource_attribute.go | 2 +- cmd/delete/matchable_cluster_resource_attribute_test.go | 2 +- cmd/delete/matchable_execution_cluster_label.go | 2 +- cmd/delete/matchable_execution_cluster_label_test.go | 2 +- cmd/delete/matchable_execution_queue_attribute.go | 2 +- cmd/delete/matchable_execution_queue_attribute_test.go | 2 +- cmd/delete/matchable_plugin_override.go | 2 +- cmd/delete/matchable_plugin_override_test.go | 2 +- cmd/delete/matchable_task_resource_attribute.go | 2 +- cmd/delete/matchable_task_resource_attribute_test.go | 2 +- cmd/delete/matchable_workflow_execution_config.go | 2 +- cmd/delete/matchable_workflow_execution_config_test.go | 2 +- cmd/demo/reload.go | 2 +- cmd/get/execution.go | 4 ++-- cmd/get/execution_test.go | 4 ++-- cmd/get/execution_util.go | 2 +- cmd/get/launch_plan.go | 4 ++-- cmd/get/launch_plan_test.go | 4 ++-- cmd/get/matchable_attribute_util.go | 2 +- cmd/get/matchable_cluster_resource_attribute.go | 2 +- cmd/get/matchable_cluster_resource_attribute_test.go | 2 +- cmd/get/matchable_execution_cluster_label.go | 2 +- cmd/get/matchable_execution_cluster_label_test.go | 2 +- cmd/get/matchable_execution_queue_attribute.go | 2 +- cmd/get/matchable_execution_queue_attribute_test.go | 2 +- cmd/get/matchable_plugin_override.go | 2 +- cmd/get/matchable_plugin_override_test.go | 2 +- cmd/get/matchable_task_resource_attribute.go | 2 +- cmd/get/matchable_task_resource_attribute_test.go | 2 +- cmd/get/matchable_workflow_execution_config.go | 4 ++-- cmd/get/matchable_workflow_execution_config_test.go | 2 +- cmd/get/node_execution.go | 4 ++-- cmd/get/project_test.go | 2 +- cmd/get/task.go | 4 ++-- cmd/get/task_test.go | 2 +- cmd/get/workflow.go | 2 +- cmd/get/workflow_test.go | 2 +- cmd/register/examples.go | 2 +- cmd/register/files.go | 2 +- cmd/register/files_test.go | 4 ++-- cmd/register/register_util.go | 8 ++++---- cmd/register/register_util_test.go | 4 ++-- cmd/root.go | 4 ++-- cmd/update/execution.go | 6 +++--- cmd/update/execution_test.go | 2 +- cmd/update/interfaces/updater.go | 2 +- cmd/update/launch_plan.go | 6 +++--- cmd/update/launch_plan_meta.go | 2 +- cmd/update/launch_plan_meta_test.go | 2 +- cmd/update/launch_plan_test.go | 2 +- cmd/update/named_entity.go | 4 ++-- cmd/update/named_entity_test.go | 2 +- cmd/update/project.go | 2 +- cmd/update/project_test.go | 2 +- cmd/update/task_meta.go | 2 +- cmd/update/task_meta_test.go | 2 +- cmd/update/workflow_meta.go | 2 +- cmd/update/workflow_meta_test.go | 2 +- cmd/version/version.go | 2 +- cmd/version/version_test.go | 2 +- main.go | 2 +- pkg/ext/execution_fetcher.go | 2 +- pkg/filters/util_test.go | 2 +- pkg/github/githubutil.go | 4 ++-- pkg/github/githubutil_test.go | 2 +- pkg/printer/printer.go | 2 +- pkg/sandbox/start.go | 2 +- pkg/visualize/graphviz_test.go | 2 +- 78 files changed, 102 insertions(+), 102 deletions(-) diff --git a/cmd/compile/compile.go b/cmd/compile/compile.go index f3f6753c..035ea786 100644 --- a/cmd/compile/compile.go +++ b/cmd/compile/compile.go @@ -6,13 +6,13 @@ import ( "io/ioutil" "os" - config "github.com/flyteorg/flytectl/cmd/config/subcommand/compile" - cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flytectl/cmd/register" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyte/flytepropeller/pkg/compiler" "github.com/flyteorg/flyte/flytepropeller/pkg/compiler/common" + config "github.com/flyteorg/flytectl/cmd/config/subcommand/compile" + cmdCore "github.com/flyteorg/flytectl/cmd/core" + "github.com/flyteorg/flytectl/cmd/register" ) // Utility function for compiling a list of Tasks diff --git a/cmd/config/subcommand/project/project_config.go b/cmd/config/subcommand/project/project_config.go index 38f13136..af414561 100644 --- a/cmd/config/subcommand/project/project_config.go +++ b/cmd/config/subcommand/project/project_config.go @@ -4,10 +4,10 @@ import ( "fmt" "io/ioutil" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/pkg/filters" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "gopkg.in/yaml.v3" ) diff --git a/cmd/config/subcommand/project/project_config_test.go b/cmd/config/subcommand/project/project_config_test.go index d66aff2c..69a8bf4a 100644 --- a/cmd/config/subcommand/project/project_config_test.go +++ b/cmd/config/subcommand/project/project_config_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/cmd/configuration/configuration.go b/cmd/configuration/configuration.go index a11fab3a..80532024 100644 --- a/cmd/configuration/configuration.go +++ b/cmd/configuration/configuration.go @@ -12,10 +12,10 @@ import ( "github.com/flyteorg/flytectl/pkg/configutil" + "github.com/flyteorg/flyte/flytestdlib/config/viper" initConfig "github.com/flyteorg/flytectl/cmd/config/subcommand/config" cmdcore "github.com/flyteorg/flytectl/cmd/core" cmdUtil "github.com/flyteorg/flytectl/pkg/commandutils" - "github.com/flyteorg/flyte/flytestdlib/config/viper" "github.com/go-ozzo/ozzo-validation/v4/is" "github.com/spf13/cobra" ) diff --git a/cmd/core/cmd.go b/cmd/core/cmd.go index 2555cb4a..2d00adc0 100644 --- a/cmd/core/cmd.go +++ b/cmd/core/cmd.go @@ -8,9 +8,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "github.com/flyteorg/flyte/flyteidl/clients/go/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/pkg/pkce" - "github.com/flyteorg/flyte/flyteidl/clients/go/admin" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/core/cmd_ctx.go b/cmd/core/cmd_ctx.go index d42fdee5..d492c53c 100644 --- a/cmd/core/cmd_ctx.go +++ b/cmd/core/cmd_ctx.go @@ -5,8 +5,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/clients/go/admin" - "github.com/flyteorg/flytectl/pkg/ext" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service" + "github.com/flyteorg/flytectl/pkg/ext" ) type CommandContext struct { diff --git a/cmd/create/project.go b/cmd/create/project.go index 60bfa3f3..bf4e70c0 100644 --- a/cmd/create/project.go +++ b/cmd/create/project.go @@ -4,13 +4,13 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/project" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flyte/flytestdlib/logger" + cmdCore "github.com/flyteorg/flytectl/cmd/core" ) const ( diff --git a/cmd/delete/execution.go b/cmd/delete/execution.go index 1a9003c2..5d2e0ff4 100644 --- a/cmd/delete/execution.go +++ b/cmd/delete/execution.go @@ -3,12 +3,12 @@ package delete import ( "context" - "github.com/flyteorg/flytectl/cmd/config" - "github.com/flyteorg/flytectl/cmd/config/subcommand/execution" - cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flytectl/cmd/config" + "github.com/flyteorg/flytectl/cmd/config/subcommand/execution" + cmdCore "github.com/flyteorg/flytectl/cmd/core" ) // Long descriptions are whitespace sensitive when generating docs using Sphinx. diff --git a/cmd/delete/execution_test.go b/cmd/delete/execution_test.go index 38469d59..63643a2c 100644 --- a/cmd/delete/execution_test.go +++ b/cmd/delete/execution_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flytectl/cmd/config" "github.com/stretchr/testify/assert" ) diff --git a/cmd/delete/matchable_attribute_util.go b/cmd/delete/matchable_attribute_util.go index efdd0d74..63c018cb 100644 --- a/cmd/delete/matchable_attribute_util.go +++ b/cmd/delete/matchable_attribute_util.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/flyteorg/flytectl/pkg/ext" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flytectl/pkg/ext" ) func deleteMatchableAttr(ctx context.Context, project, domain, workflowName string, diff --git a/cmd/delete/matchable_cluster_resource_attribute.go b/cmd/delete/matchable_cluster_resource_attribute.go index b1a5251f..5b7a04f8 100644 --- a/cmd/delete/matchable_cluster_resource_attribute.go +++ b/cmd/delete/matchable_cluster_resource_attribute.go @@ -3,11 +3,11 @@ package delete import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/clusterresourceattribute" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/delete/matchable_cluster_resource_attribute_test.go b/cmd/delete/matchable_cluster_resource_attribute_test.go index 689cbe31..37dd1394 100644 --- a/cmd/delete/matchable_cluster_resource_attribute_test.go +++ b/cmd/delete/matchable_cluster_resource_attribute_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/clusterresourceattribute" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/delete/matchable_execution_cluster_label.go b/cmd/delete/matchable_execution_cluster_label.go index 787c6475..544b8ae6 100644 --- a/cmd/delete/matchable_execution_cluster_label.go +++ b/cmd/delete/matchable_execution_cluster_label.go @@ -3,11 +3,11 @@ package delete import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionclusterlabel" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/delete/matchable_execution_cluster_label_test.go b/cmd/delete/matchable_execution_cluster_label_test.go index 9b697d5f..f7cc5e7f 100644 --- a/cmd/delete/matchable_execution_cluster_label_test.go +++ b/cmd/delete/matchable_execution_cluster_label_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionclusterlabel" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/delete/matchable_execution_queue_attribute.go b/cmd/delete/matchable_execution_queue_attribute.go index 004821fc..082cfec4 100644 --- a/cmd/delete/matchable_execution_queue_attribute.go +++ b/cmd/delete/matchable_execution_queue_attribute.go @@ -3,11 +3,11 @@ package delete import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionqueueattribute" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/delete/matchable_execution_queue_attribute_test.go b/cmd/delete/matchable_execution_queue_attribute_test.go index e911a0c6..734323d9 100644 --- a/cmd/delete/matchable_execution_queue_attribute_test.go +++ b/cmd/delete/matchable_execution_queue_attribute_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionqueueattribute" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/delete/matchable_plugin_override.go b/cmd/delete/matchable_plugin_override.go index 1fda9459..76b90b02 100644 --- a/cmd/delete/matchable_plugin_override.go +++ b/cmd/delete/matchable_plugin_override.go @@ -3,11 +3,11 @@ package delete import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" pluginoverride "github.com/flyteorg/flytectl/cmd/config/subcommand/plugin_override" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/delete/matchable_plugin_override_test.go b/cmd/delete/matchable_plugin_override_test.go index 7c1f6667..1dcd10ca 100644 --- a/cmd/delete/matchable_plugin_override_test.go +++ b/cmd/delete/matchable_plugin_override_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" pluginoverride "github.com/flyteorg/flytectl/cmd/config/subcommand/plugin_override" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/delete/matchable_task_resource_attribute.go b/cmd/delete/matchable_task_resource_attribute.go index 4f355f1f..3bd3f4d3 100644 --- a/cmd/delete/matchable_task_resource_attribute.go +++ b/cmd/delete/matchable_task_resource_attribute.go @@ -3,11 +3,11 @@ package delete import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/taskresourceattribute" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/delete/matchable_task_resource_attribute_test.go b/cmd/delete/matchable_task_resource_attribute_test.go index be3a18c6..33744489 100644 --- a/cmd/delete/matchable_task_resource_attribute_test.go +++ b/cmd/delete/matchable_task_resource_attribute_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/taskresourceattribute" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/delete/matchable_workflow_execution_config.go b/cmd/delete/matchable_workflow_execution_config.go index 00d591b6..a284ca6d 100644 --- a/cmd/delete/matchable_workflow_execution_config.go +++ b/cmd/delete/matchable_workflow_execution_config.go @@ -5,10 +5,10 @@ import ( "github.com/flyteorg/flytectl/cmd/config/subcommand/workflowexecutionconfig" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/delete/matchable_workflow_execution_config_test.go b/cmd/delete/matchable_workflow_execution_config_test.go index 07206538..b3c41b09 100644 --- a/cmd/delete/matchable_workflow_execution_config_test.go +++ b/cmd/delete/matchable_workflow_execution_config_test.go @@ -6,8 +6,8 @@ import ( "github.com/flyteorg/flytectl/cmd/config/subcommand/workflowexecutionconfig" - "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flytectl/cmd/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/demo/reload.go b/cmd/demo/reload.go index faf6663d..05c1ccfd 100644 --- a/cmd/demo/reload.go +++ b/cmd/demo/reload.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flytestdlib/logger" cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flytectl/pkg/docker" "github.com/flyteorg/flytectl/pkg/k8s" - "github.com/flyteorg/flyte/flytestdlib/logger" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cmd/get/execution.go b/cmd/get/execution.go index 21b8d03d..55f9d26b 100644 --- a/cmd/get/execution.go +++ b/cmd/get/execution.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/execution" cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flytectl/pkg/printer" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/proto" ) diff --git a/cmd/get/execution_test.go b/cmd/get/execution_test.go index ca88b90c..635ccce8 100644 --- a/cmd/get/execution_test.go +++ b/cmd/get/execution_test.go @@ -8,10 +8,10 @@ import ( "github.com/flyteorg/flytectl/cmd/testutils" - "github.com/flyteorg/flytectl/cmd/config" - "github.com/flyteorg/flytectl/cmd/config/subcommand/execution" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flytectl/cmd/config" + "github.com/flyteorg/flytectl/cmd/config/subcommand/execution" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/get/execution_util.go b/cmd/get/execution_util.go index 2a2d3482..fc5e6500 100644 --- a/cmd/get/execution_util.go +++ b/cmd/get/execution_util.go @@ -8,10 +8,10 @@ import ( "gopkg.in/yaml.v3" - cmdUtil "github.com/flyteorg/flytectl/pkg/commandutils" "github.com/flyteorg/flyte/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + cmdUtil "github.com/flyteorg/flytectl/pkg/commandutils" ) // ExecutionConfig is duplicated struct from create with the same structure. This is to avoid the circular dependency. Only works with go-yaml. diff --git a/cmd/get/launch_plan.go b/cmd/get/launch_plan.go index 5f17729e..1e230416 100644 --- a/cmd/get/launch_plan.go +++ b/cmd/get/launch_plan.go @@ -4,13 +4,13 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/launchplan" cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flytectl/pkg/ext" "github.com/flyteorg/flytectl/pkg/printer" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/proto" ) diff --git a/cmd/get/launch_plan_test.go b/cmd/get/launch_plan_test.go index 9dda91c5..87085716 100644 --- a/cmd/get/launch_plan_test.go +++ b/cmd/get/launch_plan_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/mock" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/launchplan" "github.com/flyteorg/flytectl/pkg/ext/mocks" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/cmd/get/matchable_attribute_util.go b/cmd/get/matchable_attribute_util.go index 85cca29f..df4468c6 100644 --- a/cmd/get/matchable_attribute_util.go +++ b/cmd/get/matchable_attribute_util.go @@ -3,9 +3,9 @@ package get import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/pkg/ext" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) func FetchAndUnDecorateMatchableAttr(ctx context.Context, project, domain, workflowName string, diff --git a/cmd/get/matchable_cluster_resource_attribute.go b/cmd/get/matchable_cluster_resource_attribute.go index 5074a7c9..a9fd0b40 100644 --- a/cmd/get/matchable_cluster_resource_attribute.go +++ b/cmd/get/matchable_cluster_resource_attribute.go @@ -3,11 +3,11 @@ package get import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/clusterresourceattribute" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/get/matchable_cluster_resource_attribute_test.go b/cmd/get/matchable_cluster_resource_attribute_test.go index 6cc0a60e..6e601f3c 100644 --- a/cmd/get/matchable_cluster_resource_attribute_test.go +++ b/cmd/get/matchable_cluster_resource_attribute_test.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flytectl/cmd/testutils" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/clusterresourceattribute" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/get/matchable_execution_cluster_label.go b/cmd/get/matchable_execution_cluster_label.go index be3f46fb..e47e17ff 100644 --- a/cmd/get/matchable_execution_cluster_label.go +++ b/cmd/get/matchable_execution_cluster_label.go @@ -3,11 +3,11 @@ package get import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionclusterlabel" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/get/matchable_execution_cluster_label_test.go b/cmd/get/matchable_execution_cluster_label_test.go index 5db7f9d0..e418a5fc 100644 --- a/cmd/get/matchable_execution_cluster_label_test.go +++ b/cmd/get/matchable_execution_cluster_label_test.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flytectl/cmd/testutils" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionclusterlabel" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/get/matchable_execution_queue_attribute.go b/cmd/get/matchable_execution_queue_attribute.go index 5af523fe..f5ac300a 100644 --- a/cmd/get/matchable_execution_queue_attribute.go +++ b/cmd/get/matchable_execution_queue_attribute.go @@ -3,11 +3,11 @@ package get import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionqueueattribute" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/get/matchable_execution_queue_attribute_test.go b/cmd/get/matchable_execution_queue_attribute_test.go index ecb1080b..a47b9c78 100644 --- a/cmd/get/matchable_execution_queue_attribute_test.go +++ b/cmd/get/matchable_execution_queue_attribute_test.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flytectl/cmd/testutils" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/executionqueueattribute" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/get/matchable_plugin_override.go b/cmd/get/matchable_plugin_override.go index cdf4748a..be6a1004 100644 --- a/cmd/get/matchable_plugin_override.go +++ b/cmd/get/matchable_plugin_override.go @@ -3,11 +3,11 @@ package get import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" pluginoverride "github.com/flyteorg/flytectl/cmd/config/subcommand/plugin_override" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/get/matchable_plugin_override_test.go b/cmd/get/matchable_plugin_override_test.go index 91f1f1e9..a4f6c125 100644 --- a/cmd/get/matchable_plugin_override_test.go +++ b/cmd/get/matchable_plugin_override_test.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flytectl/cmd/testutils" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" pluginoverride "github.com/flyteorg/flytectl/cmd/config/subcommand/plugin_override" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/get/matchable_task_resource_attribute.go b/cmd/get/matchable_task_resource_attribute.go index 98f9babb..63ec6906 100644 --- a/cmd/get/matchable_task_resource_attribute.go +++ b/cmd/get/matchable_task_resource_attribute.go @@ -3,11 +3,11 @@ package get import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/taskresourceattribute" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) const ( diff --git a/cmd/get/matchable_task_resource_attribute_test.go b/cmd/get/matchable_task_resource_attribute_test.go index 7e6c9a98..c21ddcd9 100644 --- a/cmd/get/matchable_task_resource_attribute_test.go +++ b/cmd/get/matchable_task_resource_attribute_test.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flytectl/cmd/testutils" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/taskresourceattribute" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/get/matchable_workflow_execution_config.go b/cmd/get/matchable_workflow_execution_config.go index 457b53b1..ba414f78 100644 --- a/cmd/get/matchable_workflow_execution_config.go +++ b/cmd/get/matchable_workflow_execution_config.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flytectl/cmd/config" sconfig "github.com/flyteorg/flytectl/cmd/config/subcommand" "github.com/flyteorg/flytectl/cmd/config/subcommand/workflowexecutionconfig" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/cmd/get/matchable_workflow_execution_config_test.go b/cmd/get/matchable_workflow_execution_config_test.go index 046873e6..0f9658c7 100644 --- a/cmd/get/matchable_workflow_execution_config_test.go +++ b/cmd/get/matchable_workflow_execution_config_test.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flytectl/cmd/testutils" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/workflowexecutionconfig" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/get/node_execution.go b/cmd/get/node_execution.go index e719e070..bec0a5a9 100644 --- a/cmd/get/node_execution.go +++ b/cmd/get/node_execution.go @@ -7,11 +7,11 @@ import ( "sort" "strconv" - cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flytectl/pkg/printer" "github.com/flyteorg/flyte/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + cmdCore "github.com/flyteorg/flytectl/cmd/core" + "github.com/flyteorg/flytectl/pkg/printer" "github.com/disiqueira/gotree" "github.com/golang/protobuf/jsonpb" diff --git a/cmd/get/project_test.go b/cmd/get/project_test.go index 3380e492..7efed267 100644 --- a/cmd/get/project_test.go +++ b/cmd/get/project_test.go @@ -8,8 +8,8 @@ import ( "github.com/flyteorg/flytectl/cmd/config/subcommand/project" - "github.com/flyteorg/flytectl/pkg/filters" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flytectl/pkg/filters" "github.com/stretchr/testify/assert" ) diff --git a/cmd/get/task.go b/cmd/get/task.go index 7e346b23..b5e1b13d 100644 --- a/cmd/get/task.go +++ b/cmd/get/task.go @@ -3,13 +3,13 @@ package get import ( "context" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/cmd/config" taskConfig "github.com/flyteorg/flytectl/cmd/config/subcommand/task" cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flytectl/pkg/ext" "github.com/flyteorg/flytectl/pkg/printer" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/proto" ) diff --git a/cmd/get/task_test.go b/cmd/get/task_test.go index 5c6b279b..2429f381 100644 --- a/cmd/get/task_test.go +++ b/cmd/get/task_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/mock" - "github.com/flyteorg/flytectl/pkg/ext/mocks" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flytectl/pkg/ext/mocks" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/cmd/get/workflow.go b/cmd/get/workflow.go index 4d95e615..d59437a3 100644 --- a/cmd/get/workflow.go +++ b/cmd/get/workflow.go @@ -3,9 +3,9 @@ package get import ( "context" + "github.com/flyteorg/flyte/flytestdlib/logger" workflowconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/workflow" "github.com/flyteorg/flytectl/pkg/ext" - "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/golang/protobuf/proto" "github.com/flyteorg/flytectl/cmd/config" diff --git a/cmd/get/workflow_test.go b/cmd/get/workflow_test.go index 17f62219..e534e373 100644 --- a/cmd/get/workflow_test.go +++ b/cmd/get/workflow_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/flyteorg/flytectl/pkg/ext/mocks" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flytectl/pkg/ext/mocks" "github.com/flyteorg/flytectl/cmd/config/subcommand/workflow" ) diff --git a/cmd/register/examples.go b/cmd/register/examples.go index a6e9f1e2..fdccad08 100644 --- a/cmd/register/examples.go +++ b/cmd/register/examples.go @@ -4,11 +4,11 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/cmd/config" rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" cmdCore "github.com/flyteorg/flytectl/cmd/core" g "github.com/flyteorg/flytectl/pkg/github" - "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/google/go-github/v42/github" ) diff --git a/cmd/register/files.go b/cmd/register/files.go index 5582305b..f9b70696 100644 --- a/cmd/register/files.go +++ b/cmd/register/files.go @@ -10,10 +10,10 @@ import ( "github.com/flyteorg/flyte/flytestdlib/storage" + "github.com/flyteorg/flyte/flytestdlib/logger" rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flytectl/pkg/printer" - "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/cmd/register/files_test.go b/cmd/register/files_test.go index ee5aad7f..0eec7701 100644 --- a/cmd/register/files_test.go +++ b/cmd/register/files_test.go @@ -7,13 +7,13 @@ import ( "github.com/flyteorg/flyte/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service" - "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flyte/flytestdlib/contextutils" "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/flyteorg/flyte/flytestdlib/storage" + "github.com/flyteorg/flytectl/cmd/config" - rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" "github.com/flyteorg/flyte/flytestdlib/promutils" + rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/cmd/register/register_util.go b/cmd/register/register_util.go index 87ef7ac7..9c9a2e70 100644 --- a/cmd/register/register_util.go +++ b/cmd/register/register_util.go @@ -29,14 +29,14 @@ import ( "github.com/flyteorg/flyte/flytestdlib/promutils/labeled" "github.com/flyteorg/flyte/flytestdlib/utils" - "github.com/flyteorg/flytectl/cmd/config" - rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" - cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flytectl/pkg/printer" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flyte/flytestdlib/storage" + "github.com/flyteorg/flytectl/cmd/config" + rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" + cmdCore "github.com/flyteorg/flytectl/cmd/core" + "github.com/flyteorg/flytectl/pkg/printer" "github.com/google/go-github/v42/github" "github.com/golang/protobuf/jsonpb" diff --git a/cmd/register/register_util_test.go b/cmd/register/register_util_test.go index 705b491c..94dc1912 100644 --- a/cmd/register/register_util_test.go +++ b/cmd/register/register_util_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - ghMocks "github.com/flyteorg/flytectl/pkg/github/mocks" "github.com/flyteorg/flyte/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service" + ghMocks "github.com/flyteorg/flytectl/pkg/github/mocks" "github.com/flyteorg/flyte/flytestdlib/utils" @@ -27,8 +27,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" - rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + rconfig "github.com/flyteorg/flytectl/cmd/config/subcommand/register" "github.com/google/go-github/v42/github" "github.com/stretchr/testify/assert" diff --git a/cmd/root.go b/cmd/root.go index 4f651e8c..a2620516 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -5,6 +5,8 @@ import ( "fmt" "os" + stdConfig "github.com/flyteorg/flyte/flytestdlib/config" + "github.com/flyteorg/flyte/flytestdlib/config/viper" "github.com/flyteorg/flytectl/cmd/compile" "github.com/flyteorg/flytectl/cmd/config" configuration "github.com/flyteorg/flytectl/cmd/configuration" @@ -20,8 +22,6 @@ import ( "github.com/flyteorg/flytectl/cmd/version" f "github.com/flyteorg/flytectl/pkg/filesystemutils" "github.com/flyteorg/flytectl/pkg/printer" - stdConfig "github.com/flyteorg/flyte/flytestdlib/config" - "github.com/flyteorg/flyte/flytestdlib/config/viper" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/update/execution.go b/cmd/update/execution.go index 049f5976..90021378 100644 --- a/cmd/update/execution.go +++ b/cmd/update/execution.go @@ -4,13 +4,13 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/execution" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/cmd/update/execution_test.go b/cmd/update/execution_test.go index 444f6647..2204ebd9 100644 --- a/cmd/update/execution_test.go +++ b/cmd/update/execution_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config/subcommand/execution" "github.com/flyteorg/flytectl/cmd/testutils" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/update/interfaces/updater.go b/cmd/update/interfaces/updater.go index acafe958..3aea6aec 100644 --- a/cmd/update/interfaces/updater.go +++ b/cmd/update/interfaces/updater.go @@ -3,8 +3,8 @@ package interfaces import ( "context" - cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + cmdCore "github.com/flyteorg/flytectl/cmd/core" ) //go:generate mockery -name=Updater -case=underscore diff --git a/cmd/update/launch_plan.go b/cmd/update/launch_plan.go index c335a4e2..c94594d8 100644 --- a/cmd/update/launch_plan.go +++ b/cmd/update/launch_plan.go @@ -4,13 +4,13 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/launchplan" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/cmd/update/launch_plan_meta.go b/cmd/update/launch_plan_meta.go index f0bdaee6..48adf33e 100644 --- a/cmd/update/launch_plan_meta.go +++ b/cmd/update/launch_plan_meta.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" ) const ( diff --git a/cmd/update/launch_plan_meta_test.go b/cmd/update/launch_plan_meta_test.go index 2df31f80..36744d50 100644 --- a/cmd/update/launch_plan_meta_test.go +++ b/cmd/update/launch_plan_meta_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytectl/cmd/testutils" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flytectl/cmd/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/update/launch_plan_test.go b/cmd/update/launch_plan_test.go index ce19336d..26b9f48b 100644 --- a/cmd/update/launch_plan_test.go +++ b/cmd/update/launch_plan_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/cmd/config/subcommand/launchplan" "github.com/flyteorg/flytectl/cmd/testutils" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/update/named_entity.go b/cmd/update/named_entity.go index 7ca988b2..26d6e089 100644 --- a/cmd/update/named_entity.go +++ b/cmd/update/named_entity.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/flyteorg/flytectl/clierrors" - cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flytectl/clierrors" + cmdCore "github.com/flyteorg/flytectl/cmd/core" ) //go:generate pflags NamedEntityConfig --default-var namedEntityConfig --bind-default-var diff --git a/cmd/update/named_entity_test.go b/cmd/update/named_entity_test.go index b763d2f8..d44b75e1 100644 --- a/cmd/update/named_entity_test.go +++ b/cmd/update/named_entity_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytectl/cmd/testutils" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flytectl/cmd/testutils" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/assert" diff --git a/cmd/update/project.go b/cmd/update/project.go index d9f4b5f1..29775cd7 100644 --- a/cmd/update/project.go +++ b/cmd/update/project.go @@ -4,11 +4,11 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flytectl/cmd/config/subcommand/project" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flytestdlib/logger" ) const ( diff --git a/cmd/update/project_test.go b/cmd/update/project_test.go index 8146cd2b..29f50c18 100644 --- a/cmd/update/project_test.go +++ b/cmd/update/project_test.go @@ -7,9 +7,9 @@ import ( "github.com/flyteorg/flytectl/cmd/config/subcommand/project" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/stretchr/testify/assert" ) diff --git a/cmd/update/task_meta.go b/cmd/update/task_meta.go index aba87d4b..cb9e3e92 100644 --- a/cmd/update/task_meta.go +++ b/cmd/update/task_meta.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" ) const ( diff --git a/cmd/update/task_meta_test.go b/cmd/update/task_meta_test.go index c0d5b0ca..f91963cb 100644 --- a/cmd/update/task_meta_test.go +++ b/cmd/update/task_meta_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytectl/cmd/testutils" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flytectl/cmd/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/update/workflow_meta.go b/cmd/update/workflow_meta.go index 07857770..d2c94d7e 100644 --- a/cmd/update/workflow_meta.go +++ b/cmd/update/workflow_meta.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flytectl/clierrors" "github.com/flyteorg/flytectl/cmd/config" cmdCore "github.com/flyteorg/flytectl/cmd/core" - "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" ) const ( diff --git a/cmd/update/workflow_meta_test.go b/cmd/update/workflow_meta_test.go index 6f881af7..23c7f353 100644 --- a/cmd/update/workflow_meta_test.go +++ b/cmd/update/workflow_meta_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/flyteorg/flytectl/cmd/testutils" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flytectl/cmd/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/version/version.go b/cmd/version/version.go index 03a2a753..dadbde64 100644 --- a/cmd/version/version.go +++ b/cmd/version/version.go @@ -10,10 +10,10 @@ import ( "github.com/flyteorg/flytectl/pkg/platformutil" - cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flytestdlib/logger" stdlibversion "github.com/flyteorg/flyte/flytestdlib/version" + cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/spf13/cobra" ) diff --git a/cmd/version/version_test.go b/cmd/version/version_test.go index 649f4302..f694089b 100644 --- a/cmd/version/version_test.go +++ b/cmd/version/version_test.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" - cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/flyteorg/flyte/flyteidl/clients/go/admin/mocks" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" stdlibversion "github.com/flyteorg/flyte/flytestdlib/version" + cmdCore "github.com/flyteorg/flytectl/cmd/core" "github.com/stretchr/testify/assert" ) diff --git a/main.go b/main.go index 45a03688..b410bcd0 100644 --- a/main.go +++ b/main.go @@ -4,8 +4,8 @@ import ( "context" "os" - "github.com/flyteorg/flytectl/cmd" "github.com/flyteorg/flyte/flytestdlib/logger" + "github.com/flyteorg/flytectl/cmd" ) func main() { diff --git a/pkg/ext/execution_fetcher.go b/pkg/ext/execution_fetcher.go index 5bd70720..41ebea9b 100644 --- a/pkg/ext/execution_fetcher.go +++ b/pkg/ext/execution_fetcher.go @@ -3,9 +3,9 @@ package ext import ( "context" - "github.com/flyteorg/flytectl/pkg/filters" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flytectl/pkg/filters" ) func (a *AdminFetcherExtClient) FetchExecution(ctx context.Context, name, project, domain string) (*admin.Execution, error) { diff --git a/pkg/filters/util_test.go b/pkg/filters/util_test.go index c20f315f..b1289455 100644 --- a/pkg/filters/util_test.go +++ b/pkg/filters/util_test.go @@ -3,8 +3,8 @@ package filters import ( "testing" - "github.com/flyteorg/flytectl/cmd/config" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flytectl/cmd/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/github/githubutil.go b/pkg/github/githubutil.go index 8e5403db..2d72b67a 100644 --- a/pkg/github/githubutil.go +++ b/pkg/github/githubutil.go @@ -9,10 +9,10 @@ import ( "runtime" "strings" - "github.com/flyteorg/flytectl/pkg/platformutil" - "github.com/flyteorg/flytectl/pkg/util" "github.com/flyteorg/flyte/flytestdlib/logger" stdlibversion "github.com/flyteorg/flyte/flytestdlib/version" + "github.com/flyteorg/flytectl/pkg/platformutil" + "github.com/flyteorg/flytectl/pkg/util" "github.com/google/go-github/v42/github" "github.com/mouuff/go-rocket-update/pkg/provider" diff --git a/pkg/github/githubutil_test.go b/pkg/github/githubutil_test.go index 92c015a6..41247ac9 100644 --- a/pkg/github/githubutil_test.go +++ b/pkg/github/githubutil_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" + stdlibversion "github.com/flyteorg/flyte/flytestdlib/version" "github.com/flyteorg/flytectl/pkg/github/mocks" "github.com/flyteorg/flytectl/pkg/platformutil" - stdlibversion "github.com/flyteorg/flyte/flytestdlib/version" "github.com/google/go-github/v42/github" "github.com/stretchr/testify/assert" diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go index 0ac9f563..e3b406b9 100644 --- a/pkg/printer/printer.go +++ b/pkg/printer/printer.go @@ -9,10 +9,10 @@ import ( "sort" "strings" - "github.com/flyteorg/flytectl/pkg/visualize" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyte/flytestdlib/errors" + "github.com/flyteorg/flytectl/pkg/visualize" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" diff --git a/pkg/sandbox/start.go b/pkg/sandbox/start.go index 37f19d61..be79fd3a 100644 --- a/pkg/sandbox/start.go +++ b/pkg/sandbox/start.go @@ -13,6 +13,7 @@ import ( "github.com/docker/docker/api/types/mount" "github.com/docker/go-connections/nat" "github.com/enescakir/emoji" + "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/flyteorg/flytectl/clierrors" sandboxCmdConfig "github.com/flyteorg/flytectl/cmd/config/subcommand/sandbox" "github.com/flyteorg/flytectl/pkg/configutil" @@ -20,7 +21,6 @@ import ( "github.com/flyteorg/flytectl/pkg/github" "github.com/flyteorg/flytectl/pkg/k8s" "github.com/flyteorg/flytectl/pkg/util" - "github.com/flyteorg/flyte/flytestdlib/logger" "github.com/kataras/tablewriter" corev1api "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/visualize/graphviz_test.go b/pkg/visualize/graphviz_test.go index 5a14c03c..710ce01f 100644 --- a/pkg/visualize/graphviz_test.go +++ b/pkg/visualize/graphviz_test.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "testing" - "github.com/flyteorg/flytectl/pkg/visualize/mocks" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flytectl/pkg/visualize/mocks" graphviz "github.com/awalterschulze/gographviz" "github.com/golang/protobuf/jsonpb" From 363d4e32208574edf13d101b7259ff0022ffb738 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 6 Oct 2023 13:46:00 -0700 Subject: [PATCH 2/3] deprecated authentication k8s api version Signed-off-by: Katrina Rogan --- pkg/k8s/k8s_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/k8s/k8s_test.go b/pkg/k8s/k8s_test.go index 0cf3db31..84dc1692 100644 --- a/pkg/k8s/k8s_test.go +++ b/pkg/k8s/k8s_test.go @@ -33,7 +33,7 @@ users: - name: foo-user user: exec: - apiVersion: client.authentication.k8s.io/v1alpha1 + apiVersion: client.authentication.k8s.io/v1beta1 args: - arg-1 - arg-2 From 378c2892572350f07bdc6c51d686936206f3ea53 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 6 Oct 2023 14:04:11 -0700 Subject: [PATCH 3/3] documetation Signed-off-by: Katrina Rogan --- .github/workflows/checks.yml | 3 --- cmd/configuration/configuration_test.go | 2 +- docs/source/gen/flytectl_config.rst | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 2a66200d..d7d36c4b 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -143,9 +143,6 @@ jobs: - Auto-generated by [flyte-bot] labels: | documentation - team-reviewers: | - owners - maintainers draft: false goreleaser: diff --git a/cmd/configuration/configuration_test.go b/cmd/configuration/configuration_test.go index 59f8ddc3..544e103f 100644 --- a/cmd/configuration/configuration_test.go +++ b/cmd/configuration/configuration_test.go @@ -35,7 +35,7 @@ func TestCreateInitCommand(t *testing.T) { assert.Equal(t, "discover", cmdNouns[0].Use) assert.Equal(t, "Searches for a config in one of the default search paths.", cmdNouns[0].Short) assert.Equal(t, "docs", cmdNouns[1].Use) - assert.Equal(t, "Generate configuration documetation in rst format", cmdNouns[1].Short) + assert.Equal(t, "Generate configuration documentation in rst format", cmdNouns[1].Short) assert.Equal(t, "init", cmdNouns[2].Use) assert.Equal(t, initCmdShort, cmdNouns[2].Short) diff --git a/docs/source/gen/flytectl_config.rst b/docs/source/gen/flytectl_config.rst index 98b30282..60e755e6 100644 --- a/docs/source/gen/flytectl_config.rst +++ b/docs/source/gen/flytectl_config.rst @@ -93,7 +93,7 @@ SEE ALSO * :doc:`flytectl` - Flytectl CLI tool * :doc:`flytectl_config_discover` - Searches for a config in one of the default search paths. -* :doc:`flytectl_config_docs` - Generate configuration documetation in rst format +* :doc:`flytectl_config_docs` - Generate configuration documentation in rst format * :doc:`flytectl_config_init` - Generates a Flytectl config file in the user's home directory. * :doc:`flytectl_config_validate` - Validates the loaded config.