flyteidl import issue

Signed-off-by: Future Outlier <[email protected]>
flyteorg · Oct 6, 2023 · 16dac19 · 16dac19
1 parent 485e90b
commit 16dac19
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/flyteplugins/go.mod b/flyteplugins/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/dask/dask-kubernetes/v2023 v2023.0.0-20230626103304-abd02cd17b26
 	github.com/flyteorg/flyte/flyteidl v0.0.0-00010101000000-000000000000
 	github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000
-	github.com/flyteorg/flyteidl v1.5.21
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.5.3
 	github.com/hashicorp/golang-lru v0.5.4

diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum
@@ -213,8 +213,6 @@ 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.21 h1:zP1byUlNFqstTe7Io1DiiNgNf+mZAVmGZM04oIUA5kU=
-github.com/flyteorg/flyteidl v1.5.21/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og=
 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/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 	"github.com/flyteorg/flyte/flytestdlib/config"
-	"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
 
 	"google.golang.org/grpc"
 
@@ -104,7 +104,7 @@ func TestPlugin(t *testing.T) {
 
 	t.Run("test PENDING Status", func(t *testing.T) {
 		taskContext := new(webapiPlugin.StatusContext)
-		taskContext.On("Resource").Return(&ResourceWrapper{
+		taskContext.On("Resource").Return(ResourceWrapper{
 			State:   admin.State_PENDING,
 			Outputs: nil,
 			Message: "Waiting for cluster",
@@ -118,7 +118,7 @@ func TestPlugin(t *testing.T) {
 
 	t.Run("test RUNNING Status", func(t *testing.T) {
 		taskContext := new(webapiPlugin.StatusContext)
-		taskContext.On("Resource").Return(&ResourceWrapper{
+		taskContext.On("Resource").Return(ResourceWrapper{
 			State:   admin.State_RUNNING,
 			Outputs: nil,
 			Message: "Job is running",
@@ -131,7 +131,7 @@ func TestPlugin(t *testing.T) {
 
 	t.Run("test PERMANENT_FAILURE Status", func(t *testing.T) {
 		taskContext := new(webapiPlugin.StatusContext)
-		taskContext.On("Resource").Return(&ResourceWrapper{
+		taskContext.On("Resource").Return(ResourceWrapper{
 			State:   admin.State_PERMANENT_FAILURE,
 			Outputs: nil,
 			Message: "",
@@ -144,7 +144,7 @@ func TestPlugin(t *testing.T) {
 
 	t.Run("test RETRYABLE_FAILURE Status", func(t *testing.T) {
 		taskContext := new(webapiPlugin.StatusContext)
-		taskContext.On("Resource").Return(&ResourceWrapper{
+		taskContext.On("Resource").Return(ResourceWrapper{
 			State:   admin.State_RETRYABLE_FAILURE,
 			Outputs: nil,
 			Message: "",
@@ -157,7 +157,7 @@ func TestPlugin(t *testing.T) {
 
 	t.Run("test UNDEFINED Status", func(t *testing.T) {
 		taskContext := new(webapiPlugin.StatusContext)
-		taskContext.On("Resource").Return(&ResourceWrapper{
+		taskContext.On("Resource").Return(ResourceWrapper{
 			State:   5,
 			Outputs: nil,
 			Message: "",

diff --git a/flytepropeller/go.sum b/flytepropeller/go.sum
@@ -242,7 +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.21 h1:zP1byUlNFqstTe7Io1DiiNgNf+mZAVmGZM04oIUA5kU=
 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/go.sum b/go.sum
@@ -343,7 +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/flyteidl v1.5.21 h1:zP1byUlNFqstTe7Io1DiiNgNf+mZAVmGZM04oIUA5kU=
 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=