Fix flytecopilot references

Signed-off-by: Eduardo Apolinario <[email protected]>
flyteorg · Sep 13, 2023 · 3a5a6b6 · 3a5a6b6
1 parent d45e420
commit 3a5a6b6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/flytecopilot/cmd/download.go b/flytecopilot/cmd/download.go
@@ -5,7 +5,7 @@ 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/flyte/flytestdlib/logger"

diff --git a/flytecopilot/cmd/sidecar.go b/flytecopilot/cmd/sidecar.go
@@ -5,8 +5,8 @@ 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/flyte/flytestdlib/logger"

diff --git a/flytecopilot/cmd/sidecar_test.go b/flytecopilot/cmd/sidecar_test.go
@@ -13,7 +13,7 @@ import (
 	"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/go.mod b/flytecopilot/go.mod
@@ -5,8 +5,7 @@ go 1.19
 require (
 	github.com/aws/aws-sdk-go v1.44.2
 	github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000
-	github.com/flyteorg/flytecopilot v0.0.33
-	github.com/flyteorg/flyteidl v1.3.6
+	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.3
@@ -43,7 +42,6 @@ require (
 	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/flytestdlib v1.0.15 // 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
@@ -109,6 +107,7 @@ require (
 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

diff --git a/flytecopilot/go.sum b/flytecopilot/go.sum
@@ -134,10 +134,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/flytecopilot v0.0.33 h1:o/dJLbkhW8u6f7BoInv30M7J0E3lYwm3bNB3aS+tcX4=
-github.com/flyteorg/flytecopilot v0.0.33/go.mod h1:WHF8GN8cTmBzJdexMfClMoHRqFihoPNPbQ44zS8cEr0=
-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.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/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() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"os"
-    	"github.com/flyteorg/flytecopilot/cmd"
+    	"github.com/flyteorg/flyte/flytecopilot/cmd"
     )
     func main() {
@@ Expand Down @@