Skip to content
This repository has been archived by the owner on May 31, 2024. It is now read-only.

Commit

Permalink
Update dependencies for Flyte monorepo migration (#429)
Browse files Browse the repository at this point in the history
* wowzas

Signed-off-by: Katrina Rogan <katroganGH@gmail.com>

* group

Signed-off-by: Katrina Rogan <katroganGH@gmail.com>

* Merge with master.

Signed-off-by: Kamal Eybov <54046807+kamaleybov@users.noreply.github.com>

* merge conflicts

Signed-off-by: Katrina Rogan <katroganGH@gmail.com>

---------

Signed-off-by: Katrina Rogan <katroganGH@gmail.com>
Signed-off-by: Kamal Eybov <54046807+kamaleybov@users.noreply.github.com>
Co-authored-by: Kamal Eybov <54046807+kamaleybov@users.noreply.github.com>
  • Loading branch information
katrogan and kamaleybov authored Oct 23, 2023
1 parent 1eda51e commit 6485353
Show file tree
Hide file tree
Showing 160 changed files with 455 additions and 958 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ jobs:
- Auto-generated by [flyte-bot]
labels: |
documentation
team-reviewers: |
owners
maintainers
draft: false

goreleaser:
Expand Down
2 changes: 1 addition & 1 deletion boilerplate/flyte/golang_support_tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package tools
import (
_ "github.com/EngHabu/mockery/cmd/mockery"
_ "github.com/alvaroloes/enumer"
_ "github.com/flyteorg/flytestdlib/cli/pflags"
_ "github.com/flyteorg/flyte/flytestdlib/cli/pflags"
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
)
8 changes: 4 additions & 4 deletions cmd/compile/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"io/ioutil"
"os"

"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"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flytepropeller/pkg/compiler"
"github.com/flyteorg/flytepropeller/pkg/compiler/common"
)

// Utility function for compiling a list of Tasks
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

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

"github.com/flyteorg/flytectl/pkg/printer"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package clusterresourceattribute

import (
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
)

// AttrFileConfig shadow Config for ClusterResourceAttributes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package clusterresourceattribute
import (
"testing"

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

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/config/console_flags.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package config

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

//go:generate pflags ConsoleConfig --default-var DefaultConsoleConfig --bind-default-var

Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/executionclusterlabel/file_config.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package executionclusterlabel

import (
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
)

// FileConfig shadow Config for ExecutionClusterLabel.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package executionclusterlabel
import (
"testing"

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

"github.com/stretchr/testify/assert"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package executionqueueattribute

import (
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
)

// AttrFileConfig shadow Config for ExecutionQueueAttributes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package executionqueueattribute
import (
"testing"

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

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/matchable_attribute_decorator.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package subcommand

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

// MatchableAttributeDecorator defines a decorator for any matchable attribute target.
type MatchableAttributeDecorator interface {
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/plugin_override/file_config.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package pluginoverride

import (
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
)

// FileConfig shadow Config for PluginOverrides.
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/plugin_override/file_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package pluginoverride
import (
"testing"

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

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/project/project_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/flyteidl/gen/pb-go/flyteidl/admin"

"gopkg.in/yaml.v3"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/project/project_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/flyteidl/gen/pb-go/flyteidl/admin"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/register/files_config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package register

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

//go:generate pflags FilesConfig --default-var DefaultFilesConfig --bind-default-var

Expand Down
2 changes: 1 addition & 1 deletion cmd/config/subcommand/taskresourceattribute/file_config.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package taskresourceattribute

import (
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
)

// TaskResourceAttrFileConfig shadow Config for TaskResourceAttribute.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package taskresourceattribute
import (
"testing"

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

"github.com/stretchr/testify/assert"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package workflowexecutionconfig

import (
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
)

// FileConfig shadow Config for WorkflowExecutionConfig.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package workflowexecutionconfig
import (
"testing"

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

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/configuration/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/flytestdlib/config/viper"
"github.com/go-ozzo/ozzo-validation/v4/is"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/configuration/configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

admin2 "github.com/flyteorg/flyteidl/clients/go/admin"
admin2 "github.com/flyteorg/flyte/flyteidl/clients/go/admin"

"github.com/flyteorg/flytectl/pkg/configutil"

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmd/core/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/flyteidl/clients/go/admin"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down
4 changes: 2 additions & 2 deletions cmd/core/cmd_ctx.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package cmdcore
import (
"io"

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

"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
"github.com/flyteorg/flytectl/pkg/ext"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
)

type CommandContext struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/core/cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/url"
"testing"

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

"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions cmd/create/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

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

"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
Expand Down
4 changes: 2 additions & 2 deletions cmd/create/execution_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/suite"
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"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"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
Expand Down
6 changes: 3 additions & 3 deletions cmd/create/execution_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"io/ioutil"
"strings"

"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/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/google/uuid"
"sigs.k8s.io/yaml"

Expand Down
4 changes: 2 additions & 2 deletions cmd/create/execution_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"testing"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"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"

Expand Down
4 changes: 2 additions & 2 deletions cmd/create/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/flyteidl/gen/pb-go/flyteidl/admin"

"github.com/flyteorg/flyte/flytestdlib/logger"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flytestdlib/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/create/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/flyteorg/flytectl/cmd/config"
"github.com/flyteorg/flytectl/cmd/config/subcommand/project"

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

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
4 changes: 2 additions & 2 deletions cmd/create/serialization_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package create
import (
"fmt"

"github.com/flyteorg/flyteidl/clients/go/coreutils"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flyteidl/clients/go/coreutils"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
)

// TODO: Move all functions to flyteidl
Expand Down
2 changes: 1 addition & 1 deletion cmd/create/serialization_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package create
import (
"testing"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/delete/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package delete
import (
"context"

"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"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flytestdlib/logger"
)

// Long descriptions are whitespace sensitive when generating docs using Sphinx.
Expand Down
4 changes: 2 additions & 2 deletions cmd/delete/execution_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"errors"
"testing"

"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/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/delete/matchable_attribute_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flytectl/pkg/ext"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
)

func deleteMatchableAttr(ctx context.Context, project, domain, workflowName string,
Expand Down
Loading

0 comments on commit 6485353

Please sign in to comment.