diff --git a/pkg/common/sorting.go b/pkg/common/sorting.go index 7057a2af8..df3096076 100644 --- a/pkg/common/sorting.go +++ b/pkg/common/sorting.go @@ -2,11 +2,12 @@ package common import ( "fmt" - "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteadmin/pkg/errors" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" "google.golang.org/grpc/codes" + "k8s.io/apimachinery/pkg/util/sets" + + "github.com/flyteorg/flyteadmin/pkg/errors" ) const gormDescending = "%s desc" diff --git a/pkg/manager/impl/util/filters.go b/pkg/manager/impl/util/filters.go index a08517719..e5e3daa0a 100644 --- a/pkg/manager/impl/util/filters.go +++ b/pkg/manager/impl/util/filters.go @@ -128,7 +128,7 @@ var allowedJoinEntities = map[common.Entity]sets.String{ common.Task: sets.NewString(common.Task), common.TaskExecution: sets.NewString(common.TaskExecution, common.Task, common.Execution, common.NodeExecution), common.Workflow: sets.NewString(common.Workflow), - common.NamedEntity: sets.NewString(common.NamedEntity), + common.NamedEntity: sets.NewString(common.NamedEntity, common.NamedEntityMetadata), common.NamedEntityMetadata: sets.NewString(common.NamedEntityMetadata), common.Project: sets.NewString(common.Project), common.Signal: sets.NewString(common.Signal), diff --git a/pkg/repositories/gormimpl/common.go b/pkg/repositories/gormimpl/common.go index 8011c1196..8feb11908 100644 --- a/pkg/repositories/gormimpl/common.go +++ b/pkg/repositories/gormimpl/common.go @@ -2,12 +2,9 @@ package gormimpl import ( "fmt" - "sync" "google.golang.org/grpc/codes" "gorm.io/gorm" - "gorm.io/gorm/schema" - "k8s.io/apimachinery/pkg/util/sets" "github.com/flyteorg/flyteadmin/pkg/common" adminErrors "github.com/flyteorg/flyteadmin/pkg/errors" @@ -118,11 +115,3 @@ func applyScopedFilters(tx *gorm.DB, inlineFilters []common.InlineFilter, mapFil } return tx, nil } - -func modelColumns(v any) sets.String { - s, err := schema.Parse(v, &sync.Map{}, schema.NamingStrategy{}) - if err != nil { - panic(err) - } - return sets.NewString(s.DBNames...) -}