Skip to content

Commit

Permalink
to flyteorg (flyteorg#43)
Browse files Browse the repository at this point in the history
  • Loading branch information
brucearctor authored Mar 18, 2021
1 parent 5406c36 commit 0a2f561
Show file tree
Hide file tree
Showing 37 changed files with 715 additions and 259 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pip-compile $(1) --upgrade --verbose
endef

generate:
go test github.com/lyft/flytectl/cmd --update
go test github.com/flyteorg/flytectl/cmd --update

compile:
go build -o bin/flytectl main.go
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
[![Docs](https://readthedocs.org/projects/flytectl/badge/?version=latest&style=plastic)](https://flytectl.rtfd.io)
[![Current Release](https://img.shields.io/github/release/flyteorg/flytectl.svg)](https://github.com/flyteorg/flytectl/releases/latest)
![Master](https://github.com/flyteorg/flytectl/workflows/Master/badge.svg)
[![GoDoc](https://godoc.org/github.com/lyft/flytectl?status.svg)](https://pkg.go.dev/mod/github.com/lyft/flytectl)
[![GoDoc](https://godoc.org/github.com/flyteorg/flytectl?status.svg)](https://pkg.go.dev/mod/github.com/flyteorg/flytectl)
[![License](https://img.shields.io/badge/LICENSE-Apache2.0-ff69b4.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
[![CodeCoverage](https://img.shields.io/codecov/c/github/flyteorg/flytectl.svg)](https://codecov.io/gh/flyteorg/flytectl)
[![Go Report Card](https://goreportcard.com/badge/github.com/lyft/flytectl)](https://goreportcard.com/report/github.com/lyft/flytectl)
[![Go Report Card](https://goreportcard.com/badge/github.com/flyteorg/flytectl)](https://goreportcard.com/report/github.com/flyteorg/flytectl)
![Commit activity](https://img.shields.io/github/commit-activity/w/lyft/flytectl.svg?style=plastic)
![Commit since last release](https://img.shields.io/github/commits-since/lyft/flytectl/latest.svg?style=plastic)

Expand All @@ -27,5 +27,3 @@ curl -s https://raw.githubusercontent.com/flyteorg/flytectl/master/install.sh |
## Contributing

[Contribution guidelines for this project](docs/CONTRIBUTING.md)


4 changes: 2 additions & 2 deletions cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

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

"github.com/lyft/flytectl/pkg/printer"
"github.com/flyteorg/flytectl/pkg/printer"
)

//go:generate pflags Config
Expand Down
4 changes: 2 additions & 2 deletions cmd/core/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/spf13/pflag"

"github.com/lyft/flyteidl/clients/go/admin"
"github.com/flyteorg/flyteidl/clients/go/admin"
"github.com/spf13/cobra"

"github.com/lyft/flytectl/cmd/config"
"github.com/flyteorg/flytectl/cmd/config"
)

type PFlagProvider interface {
Expand Down
2 changes: 1 addition & 1 deletion cmd/core/cmd_ctx.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmdcore
import (
"io"

"github.com/lyft/flyteidl/gen/pb-go/flyteidl/service"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
)

type CommandContext struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/create/create.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package create

import (
cmdcore "github.com/lyft/flytectl/cmd/core"
cmdcore "github.com/flyteorg/flytectl/cmd/core"
"github.com/spf13/cobra"
)

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

"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"gopkg.in/yaml.v2"

cmdCore "github.com/lyft/flytectl/cmd/core"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/create/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"os"
"testing"

cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flyteidl/clients/go/admin/mocks"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flyteidl/clients/go/admin/mocks"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/stretchr/testify/assert"
)

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

import (
cmdcore "github.com/lyft/flytectl/cmd/core"
cmdcore "github.com/flyteorg/flytectl/cmd/core"

"github.com/spf13/cobra"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/delete/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package delete
import (
"context"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"
"github.com/lyft/flytestdlib/logger"
"github.com/flyteorg/flytectl/cmd/config"
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
8 changes: 4 additions & 4 deletions cmd/delete/execution_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"io"
"testing"

cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flyteidl/clients/go/admin/mocks"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"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/stretchr/testify/assert"
)
Expand Down
13 changes: 6 additions & 7 deletions cmd/get/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ package get
import (
"context"

"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"

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

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flytectl/pkg/printer"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flytectl/pkg/printer"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions cmd/get/execution_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"io"
"testing"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flyteidl/clients/go/admin/mocks"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"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/stretchr/testify/assert"
)

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

import (
cmdcore "github.com/lyft/flytectl/cmd/core"
cmdcore "github.com/flyteorg/flytectl/cmd/core"

"github.com/spf13/cobra"
)
Expand Down
12 changes: 6 additions & 6 deletions cmd/get/launch_plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package get
import (
"context"

"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flytectl/pkg/adminutils"
"github.com/flyteorg/flytectl/pkg/printer"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flytestdlib/logger"
"github.com/golang/protobuf/proto"
"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flytectl/pkg/adminutils"
"github.com/lyft/flytectl/pkg/printer"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/lyft/flytestdlib/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/get/named_entity.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package get

import (
"github.com/lyft/flytectl/pkg/printer"
"github.com/flyteorg/flytectl/pkg/printer"
)

var entityColumns = []printer.Column{
Expand Down
10 changes: 5 additions & 5 deletions cmd/get/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package get
import (
"context"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flytestdlib/logger"
"github.com/golang/protobuf/proto"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/lyft/flytestdlib/logger"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flytectl/pkg/printer"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flytectl/pkg/printer"
)

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

"github.com/flyteorg/flytestdlib/logger"
"github.com/golang/protobuf/proto"
"github.com/lyft/flytestdlib/logger"

"github.com/lyft/flytectl/pkg/adminutils"
"github.com/lyft/flytectl/pkg/printer"
"github.com/flyteorg/flytectl/pkg/adminutils"
"github.com/flyteorg/flytectl/pkg/printer"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"

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

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

"github.com/flyteorg/flytestdlib/logger"
"github.com/golang/protobuf/proto"
"github.com/lyft/flytestdlib/logger"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flytectl/pkg/adminutils"
"github.com/lyft/flytectl/pkg/printer"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flytectl/pkg/adminutils"
"github.com/flyteorg/flytectl/pkg/printer"

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

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/register/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/json"
"os"

cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flytectl/pkg/printer"
"github.com/lyft/flytestdlib/logger"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flytectl/pkg/printer"
"github.com/flyteorg/flytestdlib/logger"
)

//go:generate pflags FilesConfig
Expand Down
2 changes: 1 addition & 1 deletion cmd/register/filesconfig_flags.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/register/register.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package register

import (
cmdcore "github.com/lyft/flytectl/cmd/core"
cmdcore "github.com/flyteorg/flytectl/cmd/core"
"github.com/spf13/cobra"
)

Expand Down
14 changes: 7 additions & 7 deletions cmd/register/register_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import (
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flytectl/pkg/printer"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"
"github.com/lyft/flytestdlib/logger"
"github.com/lyft/flytestdlib/storage"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flytectl/pkg/printer"
"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"
)

const registrationProjectPattern = "{{ registration.project }}"
Expand Down
18 changes: 9 additions & 9 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"context"
"fmt"

"github.com/lyft/flytectl/cmd/config"
"github.com/lyft/flytectl/cmd/create"
"github.com/lyft/flytectl/cmd/delete"
"github.com/lyft/flytectl/cmd/get"
"github.com/lyft/flytectl/cmd/register"
"github.com/lyft/flytectl/cmd/update"
"github.com/lyft/flytectl/pkg/printer"
stdConfig "github.com/lyft/flytestdlib/config"
"github.com/lyft/flytestdlib/config/viper"
"github.com/flyteorg/flytectl/cmd/config"
"github.com/flyteorg/flytectl/cmd/create"
"github.com/flyteorg/flytectl/cmd/delete"
"github.com/flyteorg/flytectl/cmd/get"
"github.com/flyteorg/flytectl/cmd/register"
"github.com/flyteorg/flytectl/cmd/update"
"github.com/flyteorg/flytectl/pkg/printer"
stdConfig "github.com/flyteorg/flytestdlib/config"
"github.com/flyteorg/flytestdlib/config/viper"

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
6 changes: 3 additions & 3 deletions cmd/update/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
)

//go:generate pflags ProjectConfig
Expand Down
8 changes: 4 additions & 4 deletions cmd/update/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"os"
"testing"

"github.com/lyft/flytectl/cmd/config"
cmdCore "github.com/lyft/flytectl/cmd/core"
"github.com/lyft/flyteidl/clients/go/admin/mocks"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/flyteorg/flytectl/cmd/config"
cmdCore "github.com/flyteorg/flytectl/cmd/core"
"github.com/flyteorg/flyteidl/clients/go/admin/mocks"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
"github.com/stretchr/testify/assert"
)

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

import (
cmdcore "github.com/lyft/flytectl/cmd/core"
cmdcore "github.com/flyteorg/flytectl/cmd/core"

"github.com/spf13/cobra"
)
Expand Down
Loading

0 comments on commit 0a2f561

Please sign in to comment.