Skip to content
This repository was archived by the owner on Oct 9, 2023. It is now read-only.

Commit 9946b32

Browse files
author
Nick Müller
committed
Extracted catalog client from propeller to stdlib
Adapted NewClient renaming for catalog client Updated to latest unpublished version of flyteidl, flyteplugins and flytestdlib Signed-off-by: Nick Müller <[email protected]>
1 parent cb85125 commit 9946b32

File tree

15 files changed

+201
-3096
lines changed

15 files changed

+201
-3096
lines changed

events/admin_eventsink_integration_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
//go:build integration
12
// +build integration
3+
24
// Add this tag to your project settings if you want to pick it up.
35

46
package events

go.mod

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@ module github.com/flyteorg/flytepropeller
22

33
go 1.18
44

5+
replace (
6+
github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6
7+
github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081
8+
github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf
9+
)
10+
511
require (
612
github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295
713
github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1
814
github.com/fatih/color v1.13.0
915
github.com/flyteorg/flyteidl v1.2.3
1016
github.com/flyteorg/flyteplugins v1.0.20
11-
github.com/flyteorg/flytestdlib v1.0.11
17+
github.com/flyteorg/flytestdlib v1.0.12
1218
github.com/ghodss/yaml v1.0.0
1319
github.com/go-redis/redis v6.15.7+incompatible
1420
github.com/go-test/deep v1.0.7
1521
github.com/golang/protobuf v1.5.2
16-
github.com/google/uuid v1.3.0
17-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
1822
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1923
github.com/imdario/mergo v0.3.13
2024
github.com/magiconair/properties v1.8.6
@@ -87,8 +91,10 @@ require (
8791
github.com/google/gnostic v0.5.7-v3refs // indirect
8892
github.com/google/go-cmp v0.5.8 // indirect
8993
github.com/google/gofuzz v1.2.0 // indirect
94+
github.com/google/uuid v1.3.0 // indirect
9095
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
9196
github.com/googleapis/go-type-adapters v1.0.0 // indirect
97+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
9298
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
9399
github.com/hashicorp/golang-lru v0.5.4 // indirect
94100
github.com/hashicorp/hcl v1.0.0 // indirect

go.sum

Lines changed: 179 additions & 153 deletions
Large diffs are not rendered by default.

pkg/controller/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
errors3 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors"
2929
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery"
3030
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan"
31-
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/catalog"
3231
"github.com/flyteorg/flytepropeller/pkg/controller/workflow"
3332
"github.com/flyteorg/flytepropeller/pkg/controller/workflowstore"
3433
leader "github.com/flyteorg/flytepropeller/pkg/leaderelection"
3534
"github.com/flyteorg/flytepropeller/pkg/utils"
35+
"github.com/flyteorg/flytestdlib/catalog"
3636

3737
"github.com/flyteorg/flytestdlib/contextutils"
3838
stdErrs "github.com/flyteorg/flytestdlib/errors"
@@ -419,7 +419,7 @@ func New(ctx context.Context, cfg *config.Config, kubeclientset kubernetes.Inter
419419
}
420420

421421
logger.Info(ctx, "Setting up Catalog client.")
422-
catalogClient, err := catalog.NewCatalogClient(ctx, authOpts...)
422+
catalogClient, err := catalog.NewClient(ctx, authOpts...)
423423
if err != nil {
424424
return nil, errors.Wrapf(err, "Failed to create datacatalog client")
425425
}

pkg/controller/nodes/executor_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/mocks"
3232
recoveryMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery/mocks"
3333
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan"
34-
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/catalog"
3534
flyteassert "github.com/flyteorg/flytepropeller/pkg/utils/assert"
35+
"github.com/flyteorg/flytestdlib/catalog"
3636

3737
"github.com/flyteorg/flytestdlib/promutils"
3838
"github.com/flyteorg/flytestdlib/promutils/labeled"

pkg/controller/nodes/task/catalog/config.go

Lines changed: 0 additions & 64 deletions
This file was deleted.

pkg/controller/nodes/task/catalog/config_flags.go

Lines changed: 0 additions & 60 deletions
This file was deleted.

pkg/controller/nodes/task/catalog/config_flags_test.go

Lines changed: 0 additions & 186 deletions
This file was deleted.

0 commit comments

Comments
 (0)